git: 4eb23465de9d - stable/13 - Explicitly link zfsd with libspl to avoid undefined references

Dimitry Andric dim at FreeBSD.org
Tue Aug 31 19:06:33 UTC 2021


The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=4eb23465de9da2889af2df44a67fc561fab5fc1e

commit 4eb23465de9da2889af2df44a67fc561fab5fc1e
Author:     Dimitry Andric <dim at FreeBSD.org>
AuthorDate: 2021-08-28 18:23:15 +0000
Commit:     Dimitry Andric <dim at FreeBSD.org>
CommitDate: 2021-08-31 19:05:52 +0000

    Explicitly link zfsd with libspl to avoid undefined references
    
    Because lld 13.0.0 is more strict about undefined references when
    linking to shared libraries, it produces the following errors for zfsd:
    
    ld: error: /home/dim/obj/home/dim/src/llvm-13-update/amd64.amd64/tmp/usr/lib/libzfs_core.so: undefined reference to libspl_assertf [--no-allow-shlib-undefined]
    ld: error: /home/dim/obj/home/dim/src/llvm-13-update/amd64.amd64/tmp/usr/lib/libnvpair.so: undefined reference to libspl_assertf [--no-allow-shlib-undefined]
    ld: error: /home/dim/obj/home/dim/src/llvm-13-update/amd64.amd64/tmp/usr/lib/libavl.so: undefined reference to libspl_assertf [--no-allow-shlib-undefined]
    *** [zfsd.full] Error code 1
    
    Fix this by adding libspl (where libspl_assertf lives) to zfsd's LIBADD.
    
    (cherry picked from commit 9fae476669574792d75706a5401bbdc927ab2b9a)
---
 cddl/usr.sbin/zfsd/Makefile.common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common
index c09f47e733dc..c18c796ce0ed 100644
--- a/cddl/usr.sbin/zfsd/Makefile.common
+++ b/cddl/usr.sbin/zfsd/Makefile.common
@@ -26,7 +26,7 @@ CFLAGS+= -I${SRCTOP}/cddl/usr.sbin
 # use issetugid(2)
 CFLAGS+= -D_MACHINE_FLOAT_H_ -DHAVE_ISSETUGID
 
-LIBADD+=	devdctl zfs zfs_core util geom bsdxml sbuf nvpair avl uutil zutil
+LIBADD+=	devdctl zfs zfs_core util geom bsdxml sbuf nvpair avl spl uutil zutil
 
 cscope:
 	find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \


More information about the dev-commits-src-branches mailing list