d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cddl: fix missing ZFS library dependencies

Browse Source 
In 9fae47666 zfsd got a libspl dependency to avoid undefined references.
However that workaround did not help external consumers of libzfs_core.

Fix all missing dependencies lld 13 and the rtld complain about.

Reviewed by:	freqlabs, markj
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D32521
This commit is contained in:
Greg V 2021-10-16 19:29:28 +03:00 committed by Mark Johnston
parent fb41143324
commit 9e9c651cac
8 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -3027,11 +3027,15 @@ _cddl_lib_libzfs_core= cddl/lib/libzfs_core
_cddl_lib_libzfs= cddl/lib/libzfs
_cddl_lib_libzfsbootenv= cddl/lib/libzfsbootenv
cddl/lib/libavl__L: cddl/lib/libspl__L
cddl/lib/libnvpair__L: cddl/lib/libspl__L
cddl/lib/libtpool__L: cddl/lib/libspl__L
cddl/lib/libzutil__L: cddl/lib/libavl__L cddl/lib/libtpool__L
cddl/lib/libzutil__L: cddl/lib/libavl__L lib/libgeom__L lib/msun__L cddl/lib/libtpool__L
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libspl__L cddl/lib/libzutil__L
cddl/lib/libzfs__L: cddl/lib/libzfs_core__L lib/msun__L lib/libutil__L
cddl/lib/libzfs__L: lib/libthr__L lib/libmd__L lib/libz__L cddl/lib/libumem__L

4
cddl/lib/Makefile
View File

@ -36,11 +36,13 @@ _pam_zfs_key= pam_zfs_key
.endif
.endif
SUBDIR_DEPEND_libavl= libspl
SUBDIR_DEPEND_libctf= libspl
SUBDIR_DEPEND_libdtrace= libctf
SUBDIR_DEPEND_libnvpair= libspl
SUBDIR_DEPEND_libtpool= libspl
SUBDIR_DEPEND_libuutil= libavl libspl
SUBDIR_DEPEND_libzfs_core= libnvpair
SUBDIR_DEPEND_libzfs_core= libnvpair libspl libzutil
SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core libzutil
SUBDIR_DEPEND_libzpool= libavl libnvpair libumem libicp
SUBDIR_DEPEND_libzutil= libavl libtpool

1
cddl/lib/libavl/Makefile
View File

@ -4,6 +4,7 @@
PACKAGE= runtime
LIB= avl
LIBADD= spl
SRCS= avl.c
WARNS?= 3
CFLAGS+= -DIN_BASE

1
cddl/lib/libnvpair/Makefile
View File

@ -4,6 +4,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
LIB= nvpair
LIBADD= spl
PACKAGE= runtime
# user

2
cddl/lib/libzfs_core/Makefile
View File

@ -7,7 +7,7 @@
LIB= zfs_core
LIBADD= nvpair
LIBADD= nvpair spl zutil
PACKAGE= runtime
INCS= libzfs_core.h

2
cddl/lib/libzutil/Makefile
View File

@ -5,7 +5,7 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
LIB= zutil
LIBADD= avl tpool
LIBADD= avl geom m tpool
PACKAGE= runtime
INCS = zutil_import.h

2
cddl/usr.sbin/zfsd/Makefile.common
View File

@ -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 spl uutil zutil
LIBADD+= devdctl zfs util geom bsdxml sbuf nvpair avl uutil zutil
cscope:
find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \

6
share/mk/src.libnames.mk
View File

@ -260,6 +260,7 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a
_DP_80211= sbuf bsdxml
_DP_9p= sbuf
_DP_archive= z bz2 lzma bsdxml zstd
_DP_avl= spl
_DP_zstd= pthread
.if ${MK_BLACKLIST} != "no"
_DP_blacklist+= pthread
@ -380,6 +381,7 @@ _DP_stats= sbuf pthread
_DP_stdthreads= pthread
_DP_tacplus= md
_DP_ncursesw= tinfow
_DP_nvpair= spl
_DP_panelw= ncursesw
_DP_rpcsec_gss= gssapi
_DP_smb= kiconv
@ -391,9 +393,9 @@ _DP_uutil= avl spl
_DP_zfs= md pthread umem util uutil m avl bsdxml crypto geom nvpair \
z zfs_core zutil
_DP_zfsbootenv= zfs nvpair
_DP_zfs_core= nvpair
_DP_zfs_core= nvpair spl zutil
_DP_zpool= md pthread z icp spl nvpair avl umem
_DP_zutil= avl tpool
_DP_zutil= avl geom m tpool
_DP_be= zfs spl nvpair zfsbootenv
_DP_netmap=
_DP_ifconfig= m