Use mkinstall when cross-compiling too. Factorize the native and cross builds install.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 24 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 5c349cab3780..7df5d9f1d5dd 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.121 2012/05/17 16:58:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.122 2012/05/17 17:59:53 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Use mkinstall when cross-compiling too. Factorize the native and cross builds
+  install.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   factorize the way of getting the csudir
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 27c89d7f1bf3..179506c97400 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -61,13 +61,13 @@ EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28
 EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
 EBUILD freebsd-lib-8.2-r1.ebuild 15691 RMD160 24faa71ebac5ed9935f52e8e2036cf2e08632ccd SHA1 a17c950b703f3ec5c4bc094d99c1ea12839855f5 SHA256 e5f57f8252c839e5e16dcb1aa29aacaba09c89d2d443a6b159fcad9210834053
 EBUILD freebsd-lib-9.0-r1.ebuild 15966 RMD160 6b7ae4425b437ba43df030f8a8b530b796878aa4 SHA1 19505d0f2a215ed6c13f2d457871cd834a103119 SHA256 c86b9b4f42fd1339ea81858fe430d3b34c6ee8a663b14369d7f957769951b7ae
-EBUILD freebsd-lib-9.0-r2.ebuild 14156 RMD160 ccde1283723010e8d581238e509f28d4de63577d SHA1 25fd1c348507da9daca65a86e29a23a503d194f4 SHA256 f03957c1da51b161c090e502f6363b4b45d1e533afb0c39cf1e29ad96cdf8243
-MISC ChangeLog 26292 RMD160 91d3d853e04965be92bd65dd4c349cad3ce6c00d SHA1 16ac9a41f11f3bc63c5dd0adfde6f007f0bdb101 SHA256 29e2574fb6da16b7be14555f5a5fa015d27a767f53a100adb723fc29ebd96de9
+EBUILD freebsd-lib-9.0-r2.ebuild 14065 RMD160 0909b09d38afed56368313b200cd7a2dd33247f4 SHA1 7c88a8318a537566b0c891081c1c9ed796119dd2 SHA256 7ce471f87762a796d0631b10f708aa8e805e46a4efea330cf4d6662f30aadbbc
+MISC ChangeLog 26463 RMD160 66865a940442a33267c1c4ba9aa47ce0cbbffa01 SHA1 a29265be42e3b626c7de34afcc22e0adc9bae35d SHA256 c94e002e2fe4976c3580cc345d76320823e88c911ea910cce9b1c9685d87df9d
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1LjkACgkQvFcC4BYPU0rHWQCgqgKSiLbI8YjlIV+6GH1PK6DL
-BV0AnjU2MukCFTqUDIGyG+vuK1eVfNyY
-=CqUL
+iEYEARECAAYFAk+1PJ8ACgkQvFcC4BYPU0pZgQCeIYrcVj0VynoWZN6+2BjBk7kn
+eN0AnRPvFX/VvF8bopc3xaZqdgRQRSY/
+=USfy
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
index 4a8f61262ce3..0c7964cbf6b2 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.7 2012/05/17 16:58:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.8 2012/05/17 17:59:53 aballier Exp $
 
 EAPI=2
 
@@ -289,23 +289,25 @@ src_install() {
 	local mylibdir=$(get_libdir)
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
-		for i in "$(get_csudir $(tc-arch-kernel ${CTARGET}))" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil ; do
-			cd "${WORKDIR}/${i}/" || die "missing ${i}."
-			$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-				INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-				FILESDIR="/usr/${CTARGET}/usr/lib" \
-				SHLIBDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ${i} failed"
-		done
+		BMAKE="$(freebsd_get_bmake)"
+		mymakeopts="${mymakeopts} NO_MAN= \
+			INCLUDEDIR=/usr/${CTARGET}/usr/include \
+			SHLIBDIR=/usr/${CTARGET}/usr/lib \
+			LIBDIR=/usr/${CTARGET}/usr/lib"
+		SUBDIRS="$(get_csudir $(tc-arch-kernel ${CTARGET})) lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
 
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		# Set SHLIBDIR and LIBDIR for multilib
-		for i in gnu/lib/libssp lib gnu/lib/libregex ; do
-			cd "${WORKDIR}/${i}/" || die "Missing ${i}."
-			SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ${i} failed."
-		done
+		mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
+		SUBDIRS="gnu/lib/libssp lib gnu/lib/libregex"
 	fi
 
+	for i in ${SUBDIRS} ; do
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		mkinstall || die "Install ${i} failed"
+	done
+
 	# Don't install the rest of the configuration files if crosscompiling
 	if [ "${CTARGET}" != "${CHOST}" ] ; then
 		# This is to get it stripped with the correct tools, otherwise it gets