diff options
author | delphij <delphij@FreeBSD.org> | 2014-05-27 18:22:52 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-05-27 18:22:52 +0000 |
commit | c49d771309eb7e07bc9723455a2c4ac46c9f3716 (patch) | |
tree | 5756828c06cfa825fb016f65ca2c87a1e98ea6ec | |
parent | 4be89b4268d840a616fe6faa0dc2655e1f8e0f7c (diff) | |
download | FreeBSD-src-c49d771309eb7e07bc9723455a2c4ac46c9f3716.zip FreeBSD-src-c49d771309eb7e07bc9723455a2c4ac46c9f3716.tar.gz |
MFC r266520:
Explicitly link libzfs against libavl as it is done in OpenSolaris
(4543:12bb2876a62e). Without this, some third party applications
may break because the lack of AVL related symbols.
FreeBSD base system are not affected because the FreeBSD ZFS command
line tools were all linked against libavl and thus hide the underlying
issue.
PR: bin/183081
-rw-r--r-- | Makefile.inc1 | 2 | ||||
-rw-r--r-- | cddl/lib/libzfs/Makefile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 9dc1b70..5cfa779 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1496,6 +1496,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ + ${_cddl_lib_libavl} \ ${_cddl_lib_libzfs_core} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ @@ -1534,6 +1535,7 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem _cddl_lib_libnvpair= cddl/lib/libnvpair +_cddl_lib_libavl= cddl/lib/libavl _cddl_lib_libzfs_core= cddl/lib/libzfs_core _cddl_lib= cddl/lib cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 16660ac..4010ac1 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -7,8 +7,8 @@ LIB= zfs DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ - ${LIBZFS_CORE} -LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core + ${LIBAVL} ${LIBZFS_CORE} +LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core SRCS= deviceid.c \ fsshare.c \ |