Apply patch to add library search path. #409693; Install library proper place according to requesting binaries' (such as /sbin/zfs) path.

(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)

2 files changed, 30 insertions, 9 deletions

diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index 37a4f7ede26b..256a50ca85e6 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-cddl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.16 2012/01/16 16:37:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.17 2012/03/30 09:14:43 naota Exp $
+
+  30 Mar 2012; Naohiro Aota <naota@gentoo.org> freebsd-cddl-9.0.ebuild:
+  Apply patch to add library search path. #409693; Install library proper place
+  according to requesting binaries' (such as /sbin/zfs) path.
 
 *freebsd-cddl-9.0 (16 Jan 2012)
 
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
index 7da41e53976c..01154b3ddd37 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.1 2012/01/16 16:37:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.2 2012/03/30 09:14:43 naota Exp $
 
-inherit bsdmk freebsd flag-o-matic eutils
+EAPI=4
+
+inherit bsdmk freebsd toolchain-funcs multilib
 
 DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
 SLOT="0"
@@ -34,20 +36,35 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/cddl"
 
 PATCHES=( "${FILESDIR}/${PN}-9.0-bsdxml.patch"
-	"${FILESDIR}/${PN}-9.0-underlink.patch" )
+	"${FILESDIR}/${PN}-9.0-underlink.patch"
+	"${FILESDIR}/${PN}-8.2-libpaths.patch" )
 
 src_unpack() {
 	freebsd_src_unpack
 	# Link in include headers.
 	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	# Force linking to new libraries
-	for i in "${S}/lib/"lib* ; do
-		append-ldflags " -L${i}"
-	done
 }
 
 src_install() {
-	freebsd_src_install
+	# Install libraries proper place
+	local mylibdir=$(get_libdir)
+	for d in libavl libctf libdtrace; do
+		cd "${S}"/lib/$d
+		mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
+	done
+	for d in libnvpair libumem libuutil libzfs libzpool;do
+		cd "${S}"/lib/$d
+		mkinstall SHLIBDIR="/${mylibdir}" LIBDIR="/${mylibdir}" || die
+	done
+	for d in lib/drti sbin usr.bin usr.sbin; do
+		cd "${S}"/$d
+		mkinstall || die
+	done
+	mv "${ED}"/${mylibdir}/lib{nvpair,umem,uutil,zfs}{,_p}.a \
+		"${ED}"/${mylibdir}/libzpool.a \
+		"${ED}"/usr/${mylibdir} || die
+	gen_usr_ldscript libnvpair.so libumem.so libuutil.so libzfs.so libzpool.so
 	# Install zfs volinit script.
+
 	newinitd "${FILESDIR}"/zvol.initd zvol
 }