diff options
| author | delphij <delphij@FreeBSD.org> | 2014-05-22 00:01:31 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-05-22 00:01:31 +0000 |
| commit | 9e29b5f65069140228be54ba30dab6ace4548361 (patch) | |
| tree | b959d924ad8e72594b4f83eb19bd231de8f445f0 | |
| parent | 3e21f8dfb3c9e29d4d29a74df78c7e57f102c069 (diff) | |
| download | FreeBSD-src-9e29b5f65069140228be54ba30dab6ace4548361.zip FreeBSD-src-9e29b5f65069140228be54ba30dab6ace4548361.tar.gz | |
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: java/183081
Tested by: jkim
MFC after: 3 days
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |
