From nobody@FreeBSD.org  Fri Oct 18 11:16:42 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 9E549171
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 18 Oct 2013 11:16:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 736AC26BE
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 18 Oct 2013 11:16:42 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9IBGf67041849
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 18 Oct 2013 11:16:41 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9IBGf3u041847;
	Fri, 18 Oct 2013 11:16:41 GMT
	(envelope-from nobody)
Message-Id: <201310181116.r9IBGf3u041847@oldred.freebsd.org>
Date: Fri, 18 Oct 2013 11:16:41 GMT
From: Lukasz Olszewski <luckyluke@plusnet.pl>
To: freebsd-gnats-submit@FreeBSD.org
Subject: java crash on machine with zfs kernel module
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183081
>Category:       bin
>Synopsis:       java crash on machine with zfs kernel module
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 18 11:20:00 UTC 2013
>Closed-Date:    Tue May 27 19:06:09 UTC 2014
>Last-Modified:  Tue May 27 19:06:09 UTC 2014
>Originator:     Lukasz Olszewski
>Release:        9.2
>Organization:
>Environment:
FreeBSD freeb 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013     root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
java crashes with the following error
/usr/lib/libzfs.so: Undefined symbol "avl_numnodes"

It happens during initial configuration of hudson CI server if the zfs module is present. If the module is removed from the kernel the configuration completes successfully

ident /usr/lib/libzfs.so
/usr/lib/libzfs.so:
     $FreeBSD: release/9.2.0/lib/csu/amd64/crti.S 217105 2011-01-07 16:07:51Z kib $
     $FreeBSD: release/9.2.0/cddl/compat/opensolaris/misc/deviceid.c 185174 2008-11-22 13:33:06Z pjd $
     $FreeBSD: release/9.2.0/cddl/compat/opensolaris/misc/zmount.c 221390 2011-05-03 16:00:26Z jh $
     $FreeBSD: release/9.2.0/cddl/compat/opensolaris/misc/fsshare.c 222313 2011-05-26 16:27:00Z will $
     $FreeBSD: release/9.2.0/cddl/compat/opensolaris/misc/mnttab.c 209962 2010-07-12 23:49:04Z mm $
     $FreeBSD: release/9.2.0/lib/csu/amd64/crtn.S 217105 2011-01-07 16:07:51Z kib $






>How-To-Repeat:
On fresh installation of 9.2-RELEASE amd64:

1. Add openjdk7

java -version
openjdk version "1.7.0_25"
OpenJDK Runtime Environment (build 1.7.0_25-b15)
OpenJDK 64-Bit Server VM (build 23.21-b01, mixed mode)

2. Add zfs kernel module

kldload zfs

kldstat
Id Refs Address            Size     Name
 1    9 0xffffffff80200000 15b93c0  kernel
 3    1 0xffffffff81812000 1583db   zfs.ko
 4    1 0xffffffff8196b000 56f7     opensolaris.ko

3. Download the latest version of hudson ci (3.1.0)

http://eclipse.org/downloads/download.php?file=/hudson/war/hudson-3.1.0.war

4. Run hudson

java -jar hudson-3.1.0.war -httpPort=8632

5. Open a browser and go to http://localhost:8632

6. On an initial setup page choose only JNA Native Support Plugin to install (in Core Compatibility Plugins section)

7. Click Install and then click Finish

The java aborts with the following error

/usr/lib/libzfs.so: Undefined symbol "avl_numnodes"


8. Remove working directory

rm -rf .hudson

9. Remove zfs module

kldunload zfs

kldstat
Id Refs Address            Size     Name
 1    1 0xffffffff80200000 15b93c0  kernel

10. Repeat steps 4-7. The setup completes successfully.




>Fix:
not known

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: jkim 
State-Changed-When: Wed May 21 22:27:12 UTC 2014 
State-Changed-Why:  
The root cause is the bundled JNA plugin for ZFS, which seems to be 
based on an ancient libzfs4j for Solaris. 

https://github.com/kohsuke/libzfs4j 

It tries to load libzfs.so via JNA but it fails because it is missing 
the symbol. 

Sorry but we cannot "fix" the ancient Solaris libzfs.so vs. modern 
FreeBSD libzfs.so incompatibility problem. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183081 
State-Changed-From-To: closed->open 
State-Changed-By: jkim 
State-Changed-When: Wed May 21 23:29:27 UTC 2014 
State-Changed-Why:  
Re-open, re-classify, and re-assign to delphij as he found a fix. ;-) 


Responsible-Changed-From-To: freebsd-java->delphij 
Responsible-Changed-By: jkim 
Responsible-Changed-When: Wed May 21 23:29:27 UTC 2014 
Responsible-Changed-Why:  
Re-open, re-classify, and re-assign to delphij as he found a fix. ;-) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183081 
State-Changed-From-To: open->patched 
State-Changed-By: delphij 
State-Changed-When: Thu May 22 00:02:47 UTC 2014 
State-Changed-Why:  
This is patched in -HEAD as of r266520.  MFC planned after 
3 days. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183081 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/183081: commit references a PR
Date: Thu, 22 May 2014 00:01:35 +0000 (UTC)

 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 \
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: java/183081: java crash on machine with zfs kernel module
Date: Wed, 21 May 2014 22:38:58 -0500

 ----- Forwarded message from Jung-uk Kim <jkim@FreeBSD.org> -----
 
 Date: Wed, 21 May 2014 19:27:26 -0400
 From: Jung-uk Kim <jkim@FreeBSD.org>
 To: d@delphij.net, luckyluke@plusnet.pl, freebsd-java@FreeBSD.org
 Subject: Re: java/183081: java crash on machine with zfs kernel module
 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0
 
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 On 2014-05-21 19:00:58 -0400, Xin Li wrote:
 > On 05/21/14 15:41, jkim@FreeBSD.org wrote:
 >> Synopsis: java crash on machine with zfs kernel module
 > 
 >> State-Changed-From-To: open->closed State-Changed-By: jkim 
 >> State-Changed-When: Wed May 21 22:27:12 UTC 2014
 >> State-Changed-Why: The root cause is the bundled JNA plugin for
 >> ZFS, which seems to be based on an ancient libzfs4j for Solaris.
 > 
 >> https://github.com/kohsuke/libzfs4j
 > 
 >> It tries to load libzfs.so via JNA but it fails because it is 
 >> missing the symbol.
 > 
 >> Sorry but we cannot "fix" the ancient Solaris libzfs.so vs.
 >> modern FreeBSD libzfs.so incompatibility problem.
 > 
 >> http://www.freebsd.org/cgi/query-pr.cgi?pr=183081
 > 
 > Actually, this does seems like a FreeBSD bug to me: libzfs.so
 > should link against libavl.so, which it didn't.  Looking at Illumos
 > source, libzfs is linked against libavl.so.
 
 I didn't bother to look at the Illumos source.  My bad.
 
 > Could you please try the attached patch, rebuild/install world and
 > see if that fixed the problem?
 
 Yes, it worked for me.  Thanks!
 
 Jung-uk Kim
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iQEcBAEBAgAGBQJTfTZeAAoJEHyflib82/FGM10IAImb5G734bXpDQnplxjMcumq
 vRKU3+1O7PI0YKKLHwVPBfzPm58ROYw1FTxh47q1PoYDGisWhfbaN3kqHWGU4mWJ
 GnQpSqAyA92ahTZs5h2IJJNfpY22JbWJI95cFwXlLEBUn9J7bjYgnIZ2PUhJ9deX
 263AXQ3cIFBmb8w+tmsobvmXPZr89RLYqQVXJY3nTMJjVEsIRHbUpsuFTtK18Haj
 QncJRohi1IQm4un/CQAB6RAFPJalOm82YuMrslWhL1Lls/EjeylqyyHpVRxMyFxZ
 pPPEgsaF07g2hCH+hQZcTER2NA5HNIaMq2lj4abNN9PpjS1kSLYsz9599nVT2hk=
 =f3Ne
 -----END PGP SIGNATURE-----
 
 ----- End forwarded message -----

From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: java/183081: java crash on machine with zfs kernel module
Date: Wed, 21 May 2014 22:38:39 -0500

 ----- Forwarded message from Xin Li <delphij@delphij.net> -----
 
 Date: Wed, 21 May 2014 16:00:58 -0700
 From: Xin Li <delphij@delphij.net>
 To: jkim@FreeBSD.org, luckyluke@plusnet.pl, freebsd-java@FreeBSD.org
 Subject: Re: java/183081: java crash on machine with zfs kernel module
 
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
 On 05/21/14 15:41, jkim@FreeBSD.org wrote:
 > Synopsis: java crash on machine with zfs kernel module
 > 
 > State-Changed-From-To: open->closed State-Changed-By: jkim 
 > State-Changed-When: Wed May 21 22:27:12 UTC 2014 State-Changed-Why:
 >  The root cause is the bundled JNA plugin for ZFS, which seems to
 > be based on an ancient libzfs4j for Solaris.
 > 
 > https://github.com/kohsuke/libzfs4j
 > 
 > It tries to load libzfs.so via JNA but it fails because it is
 > missing the symbol.
 > 
 > Sorry but we cannot "fix" the ancient Solaris libzfs.so vs. modern 
 > FreeBSD libzfs.so incompatibility problem.
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=183081
 
 Actually, this does seems like a FreeBSD bug to me: libzfs.so should
 link against libavl.so, which it didn't.  Looking at Illumos source,
 libzfs is linked against libavl.so.
 
 Could you please try the attached patch, rebuild/install world and see
 if that fixed the problem?
 
 Cheers,
 - --
 Xin LI <delphij@delphij.net>    https://www.delphij.net/
 FreeBSD - The Power to Serve!           Live free or die
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iQIcBAEBCgAGBQJTfTApAAoJEJW2GBstM+ns8ZAQAJ30lm5QYn+r7ygyhW1zULiz
 ln52+Rm0UaMqFAbNolMa68le7fy8lmzKHQToql24t6hox6Xnnd3mcO+xwX/GPWzp
 lG0F7r1dZZ0dpIbRcqNpJy0SvouH3UB6lr0B7oNWayLfD3SMc6D2c/59TEWbZrRo
 EsNuRAPODHttw9lLA6Y95zFNzG+G0Ts1nZ3w3Tjdf+9SLffNKVMf+K08adHpQv2X
 ZcvNTgVUfv6Ze01N6oBf6jaLgvoloCfQnng+f2eJy2z0aVAVa1V/fHaQwequuW3u
 h0ACl5RX7W1mJDK4Egko5Ykk75hNS6PmpK9aXc3KNZ47BvEZefBDPHZMedJhRYSD
 328CGED0x/t4i6hYqqlgYQv4RCJH0S7STO7TgN9MvTjeteNenN1s2+v41YkxAoNg
 kVUznj1qKSPBYrIOcVi9hl528iWpVxBwrv2N5YXxXV1Olr6RHg3qousg9mty4yca
 oyG85xKZyUC/JEfaQhcVRmgFLC5BhyLZkH7xoaHHUv5GtYb1dV8fhtCyQRi7AWEy
 XIJg92iR10w7/wsHXOOjeW7vB7D3wqNc9ELm6sm3n27cq7HsfM/GS7o8SxG+RQ4j
 8l2T/3BpT2hBBwTdfLndlf17mfIWQj9P3QEQm365XOzWUa9cW/MDx9TJ849DCEjU
 2pKBXhUCTfwrqnKsqKI2
 =OtH6
 -----END PGP SIGNATURE-----
 
 Index: cddl/lib/libzfs/Makefile
 ===================================================================
 --- cddl/lib/libzfs/Makefile	(revision 266429)
 +++ cddl/lib/libzfs/Makefile	(working copy)
 @@ -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 \
 
 ----- End forwarded message -----

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/183081: commit references a PR
Date: Tue, 27 May 2014 18:22:57 +0000 (UTC)

 Author: delphij
 Date: Tue May 27 18:22:52 2014
 New Revision: 266758
 URL: http://svnweb.freebsd.org/changeset/base/266758
 
 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
 
 Modified:
   stable/10/Makefile.inc1
   stable/10/cddl/lib/libzfs/Makefile
 Directory Properties:
   stable/10/   (props changed)
 
 Modified: stable/10/Makefile.inc1
 ==============================================================================
 --- stable/10/Makefile.inc1	Tue May 27 18:18:41 2014	(r266757)
 +++ stable/10/Makefile.inc1	Tue May 27 18:22:52 2014	(r266758)
 @@ -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/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/10/cddl/lib/libzfs/Makefile
 ==============================================================================
 --- stable/10/cddl/lib/libzfs/Makefile	Tue May 27 18:18:41 2014	(r266757)
 +++ stable/10/cddl/lib/libzfs/Makefile	Tue May 27 18:22:52 2014	(r266758)
 @@ -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-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/183081: commit references a PR
Date: Tue, 27 May 2014 18:45:06 +0000 (UTC)

 Author: delphij
 Date: Tue May 27 18:45:02 2014
 New Revision: 266761
 URL: http://svnweb.freebsd.org/changeset/base/266761
 
 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
 
 Modified:
   stable/8/Makefile.inc1   (contents, props changed)
   stable/8/cddl/lib/libzfs/Makefile
 Directory Properties:
   stable/8/cddl/lib/   (props changed)
 
 Modified: stable/8/Makefile.inc1
 ==============================================================================
 --- stable/8/Makefile.inc1	Tue May 27 18:39:13 2014	(r266760)
 +++ stable/8/Makefile.inc1	Tue May 27 18:45:02 2014	(r266761)
 @@ -1140,6 +1140,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} ${_secure_lib_libssh} \
 @@ -1156,6 +1157,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/8/cddl/lib/libzfs/Makefile
 ==============================================================================
 --- stable/8/cddl/lib/libzfs/Makefile	Tue May 27 18:39:13 2014	(r266760)
 +++ stable/8/cddl/lib/libzfs/Makefile	Tue May 27 18:45:02 2014	(r266761)
 @@ -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-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/183081: commit references a PR
Date: Tue, 27 May 2014 18:54:49 +0000 (UTC)

 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-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: delphij 
State-Changed-When: Tue May 27 19:05:46 UTC 2014 
State-Changed-Why:  
Fix applied against all -STABLE branches and will be part of 
upcoming 9.3-RELEASE. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183081 
>Unformatted:
