From owner-svn-src-all@FreeBSD.ORG  Thu May 22 00:01:32 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 38C869FC;
 Thu, 22 May 2014 00:01:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2681D2F63;
 Thu, 22 May 2014 00:01:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4M01WSb089644;
 Thu, 22 May 2014 00:01:32 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4M01W9C089643;
 Thu, 22 May 2014 00:01:32 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201405220001.s4M01W9C089643@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 22 May 2014 00:01:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266520 - head/cddl/lib/libzfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 May 2014 00:01:32 -0000

Author: delphij
Date: Thu May 22 00:01:31 2014
New Revision: 266520
URL: http://svnweb.freebsd.org/changeset/base/266520

Log:
  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

Modified:
  head/cddl/lib/libzfs/Makefile

Modified: head/cddl/lib/libzfs/Makefile
==============================================================================
--- head/cddl/lib/libzfs/Makefile	Wed May 21 23:04:47 2014	(r266519)
+++ head/cddl/lib/libzfs/Makefile	Thu May 22 00:01:31 2014	(r266520)
@@ -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 \