From 24d90e7ba56869f1296600374edd7f97573a5ab0 Mon Sep 17 00:00:00 2001 From: delphij Date: Tue, 27 May 2014 18:22:52 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@266758 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- Makefile.inc1 | 2 ++ cddl/lib/libzfs/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9dc1b70f0..5cfa7792c 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 16660aca3..4010ac177 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 \ -- 2.45.0