Author: delphij
Date: Tue May 27 18:54:45 2014
New Revision: 266762
URL: http://svnweb.freebsd.org/changeset/base/266762
Log:
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
Approved by: re (gjb)
Modified:
stable/9/Makefile.inc1 (contents, props changed)
stable/9/cddl/lib/libzfs/Makefile
Directory Properties:
stable/9/cddl/lib/ (props changed)
Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1 Tue May 27 18:45:02 2014 (r266761)
+++ stable/9/Makefile.inc1 Tue May 27 18:54:45 2014 (r266762)
@@ -1359,6 +1359,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} \
@@ -1379,6 +1380,7 @@ lib/libopie__L lib/libtacplus__L: lib/li
.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
Modified: stable/9/cddl/lib/libzfs/Makefile
==============================================================================
--- stable/9/cddl/lib/libzfs/Makefile Tue May 27 18:45:02 2014
(r266761)
+++ stable/9/cddl/lib/libzfs/Makefile Tue May 27 18:54:45 2014
(r266762)
@@ -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 \
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
