mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
cddl: fix missing ZFS library dependencies
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:
parent
fb41143324
commit
9e9c651cac
|
@ -3027,11 +3027,15 @@ _cddl_lib_libzfs_core= cddl/lib/libzfs_core
|
||||||
_cddl_lib_libzfs= cddl/lib/libzfs
|
_cddl_lib_libzfs= cddl/lib/libzfs
|
||||||
_cddl_lib_libzfsbootenv= cddl/lib/libzfsbootenv
|
_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/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: 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
|
cddl/lib/libzfs__L: lib/libthr__L lib/libmd__L lib/libz__L cddl/lib/libumem__L
|
||||||
|
|
|
@ -36,11 +36,13 @@ _pam_zfs_key= pam_zfs_key
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
SUBDIR_DEPEND_libavl= libspl
|
||||||
SUBDIR_DEPEND_libctf= libspl
|
SUBDIR_DEPEND_libctf= libspl
|
||||||
SUBDIR_DEPEND_libdtrace= libctf
|
SUBDIR_DEPEND_libdtrace= libctf
|
||||||
|
SUBDIR_DEPEND_libnvpair= libspl
|
||||||
SUBDIR_DEPEND_libtpool= libspl
|
SUBDIR_DEPEND_libtpool= libspl
|
||||||
SUBDIR_DEPEND_libuutil= libavl 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_libzfs= libavl libnvpair libumem libuutil libzfs_core libzutil
|
||||||
SUBDIR_DEPEND_libzpool= libavl libnvpair libumem libicp
|
SUBDIR_DEPEND_libzpool= libavl libnvpair libumem libicp
|
||||||
SUBDIR_DEPEND_libzutil= libavl libtpool
|
SUBDIR_DEPEND_libzutil= libavl libtpool
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
PACKAGE= runtime
|
PACKAGE= runtime
|
||||||
LIB= avl
|
LIB= avl
|
||||||
|
LIBADD= spl
|
||||||
SRCS= avl.c
|
SRCS= avl.c
|
||||||
WARNS?= 3
|
WARNS?= 3
|
||||||
CFLAGS+= -DIN_BASE
|
CFLAGS+= -DIN_BASE
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
|
||||||
|
|
||||||
LIB= nvpair
|
LIB= nvpair
|
||||||
|
LIBADD= spl
|
||||||
|
|
||||||
PACKAGE= runtime
|
PACKAGE= runtime
|
||||||
# user
|
# user
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
|
|
||||||
LIB= zfs_core
|
LIB= zfs_core
|
||||||
LIBADD= nvpair
|
LIBADD= nvpair spl zutil
|
||||||
PACKAGE= runtime
|
PACKAGE= runtime
|
||||||
|
|
||||||
INCS= libzfs_core.h
|
INCS= libzfs_core.h
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
|
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
|
||||||
|
|
||||||
LIB= zutil
|
LIB= zutil
|
||||||
LIBADD= avl tpool
|
LIBADD= avl geom m tpool
|
||||||
PACKAGE= runtime
|
PACKAGE= runtime
|
||||||
|
|
||||||
INCS = zutil_import.h
|
INCS = zutil_import.h
|
||||||
|
|
|
@ -26,7 +26,7 @@ CFLAGS+= -I${SRCTOP}/cddl/usr.sbin
|
||||||
# use issetugid(2)
|
# use issetugid(2)
|
||||||
CFLAGS+= -D_MACHINE_FLOAT_H_ -DHAVE_ISSETUGID
|
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:
|
cscope:
|
||||||
find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
|
find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
|
||||||
|
|
|
@ -260,6 +260,7 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a
|
||||||
_DP_80211= sbuf bsdxml
|
_DP_80211= sbuf bsdxml
|
||||||
_DP_9p= sbuf
|
_DP_9p= sbuf
|
||||||
_DP_archive= z bz2 lzma bsdxml zstd
|
_DP_archive= z bz2 lzma bsdxml zstd
|
||||||
|
_DP_avl= spl
|
||||||
_DP_zstd= pthread
|
_DP_zstd= pthread
|
||||||
.if ${MK_BLACKLIST} != "no"
|
.if ${MK_BLACKLIST} != "no"
|
||||||
_DP_blacklist+= pthread
|
_DP_blacklist+= pthread
|
||||||
|
@ -380,6 +381,7 @@ _DP_stats= sbuf pthread
|
||||||
_DP_stdthreads= pthread
|
_DP_stdthreads= pthread
|
||||||
_DP_tacplus= md
|
_DP_tacplus= md
|
||||||
_DP_ncursesw= tinfow
|
_DP_ncursesw= tinfow
|
||||||
|
_DP_nvpair= spl
|
||||||
_DP_panelw= ncursesw
|
_DP_panelw= ncursesw
|
||||||
_DP_rpcsec_gss= gssapi
|
_DP_rpcsec_gss= gssapi
|
||||||
_DP_smb= kiconv
|
_DP_smb= kiconv
|
||||||
|
@ -391,9 +393,9 @@ _DP_uutil= avl spl
|
||||||
_DP_zfs= md pthread umem util uutil m avl bsdxml crypto geom nvpair \
|
_DP_zfs= md pthread umem util uutil m avl bsdxml crypto geom nvpair \
|
||||||
z zfs_core zutil
|
z zfs_core zutil
|
||||||
_DP_zfsbootenv= zfs nvpair
|
_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_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_be= zfs spl nvpair zfsbootenv
|
||||||
_DP_netmap=
|
_DP_netmap=
|
||||||
_DP_ifconfig= m
|
_DP_ifconfig= m
|
||||||
|
|
Loading…
Reference in a new issue