diff options
| author | Greg V <greg@unrelenting.technology> | 2021-10-16 16:29:28 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-11-29 14:26:35 +0000 |
| commit | 4022f3eec40406dbd702d380ba27c875caf81e57 (patch) | |
| tree | 020572d7550939942134633fd6ef1891bed3043e /cddl/lib | |
| parent | e0cee46f5800071c105955c530ae91afa2cca002 (diff) | |
| download | src-4022f3eec40406dbd702d380ba27c875caf81e57.tar.gz src-4022f3eec40406dbd702d380ba27c875caf81e57.zip | |
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
(cherry picked from commit 9e9c651caceb9ecd17131e8bb29791ba4cf1cec7)
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/Makefile | 4 | ||||
| -rw-r--r-- | cddl/lib/libavl/Makefile | 1 | ||||
| -rw-r--r-- | cddl/lib/libnvpair/Makefile | 1 | ||||
| -rw-r--r-- | cddl/lib/libzfs_core/Makefile | 2 | ||||
| -rw-r--r-- | cddl/lib/libzutil/Makefile | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index ae6862f70443..5ca0d56b291a 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -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 diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index 2f7b9ad30856..b5e3b458f982 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -4,6 +4,7 @@ PACKAGE= runtime LIB= avl +LIBADD= spl SRCS= avl.c WARNS?= 3 CFLAGS+= -DIN_BASE diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 670253eff7c1..aaf76ed3fb28 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -4,6 +4,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair LIB= nvpair +LIBADD= spl PACKAGE= runtime # user diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index 52747bfcc2d8..6350990064f7 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -5,7 +5,7 @@ LIB= zfs_core -LIBADD= nvpair +LIBADD= nvpair spl zutil PACKAGE= runtime INCS= libzfs_core.h diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index 7aea9da14e90..b2677eb3f8ae 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -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 |