Add two variables for non native and native subdirs and define it in only one place.

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

3 files changed, 22 insertions, 11 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 53d37bf162e4..788b66db205a 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.132 2012/05/18 02:03:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.133 2012/05/18 16:17:08 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Add two variables for non native and native subdirs and define it in only one
+  place.
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Set the ssp_nonshared LDADD in its bootstrapping function. Add it only with
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 35ecf6e4d4ef..8aae14d252bb 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 13528 RMD160 175a7c4f7db8f10e5c012ba34107cc7c9a947dc2 SHA1 9ab5bae1d37a6d4d5b1a2686bb37f8a3556c27d2 SHA256 4cef3c63f453cfd0ec6c499b537d51c53ed70a411314bf983f4f92116169e4e2
-MISC ChangeLog 27924 RMD160 2928f9458f3aaebc3990f43673ce1d4dc9f49d3f SHA1 676d1ac7d9c3f4424f0cd009e91b3fec8b866ff1 SHA256 33efc6a39ece36c1fa6629dbae6f3f702d338138e53e8f98fcad5ab8a869ffd1
+EBUILD freebsd-lib-9.0-r2.ebuild 13732 RMD160 898c04b0eec51c9a7c69a00e14390a600105873c SHA1 73ee2abb912aad9af0bc7689ca41c28b411191ab SHA256 318d2fd4c5d7ee1b6eb62b02e210312d761d9ed26b772499d14224722e67de6e
+MISC ChangeLog 28093 RMD160 4ffc4c108e80a79af5fd11a81f37d28ccdc148da SHA1 c269bc3837eeb59c29d8f99be510c39dafb4e509 SHA256 33471c5d907621b70071dcd429702c61b53bae37edfa65e72898de2847fe2fe6
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1rfYACgkQvFcC4BYPU0rxlgCeIGThiZZTJqivsDlO1q2+oH6m
-96EAoJOXMi0JemPlYNzA8J4NewzJONlz
-=+aJ9
+iEYEARECAAYFAk+2dgkACgkQvFcC4BYPU0q3QQCgvGMTwPvI07AsSRVMCx65szZC
+LR8An0ZnD1sxB/QtEF7ghpUFv0qgt0Ek
+=NACW
 -----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 51a96623b363..6f4d9e932fbb 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.18 2012/05/18 02:03:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.19 2012/05/18 16:17:08 aballier Exp $
 
 EAPI=2
 
@@ -218,6 +218,13 @@ bootstrap_libssp_nonshared() {
 	export LDADD="-lssp_nonshared"
 }
 
+# What to build for a non-native build: cross-compiler, non-native abi in
+# multilib. We also need the csu but this has to be handled separately.
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
+
+# Subdirs for a native build:
+NATIVE_SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -249,7 +256,7 @@ src_compile() {
 
 		bootstrap_libssp_nonshared
 
-		SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
+		SUBDIRS="${NON_NATIVE_SUBDIRS}"
 	else
 		# Forces to use the local copy of headers with USE=build as they might
 		# be outdated in the system. Assume they are fine otherwise.
@@ -257,7 +264,7 @@ src_compile() {
 
 		use build && bootstrap_libssp_nonshared
 
-		SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
+		SUBDIRS="${NATIVE_SUBDIRS}"
 	fi
 
 	export RAW_LDFLAGS=$(raw-ldflags)
@@ -320,13 +327,13 @@ src_install() {
 			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"
+		SUBDIRS="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${NON_NATIVE_SUBDIRS}"
 
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		# Set SHLIBDIR and LIBDIR for multilib
 		mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-		SUBDIRS="gnu/lib/libssp lib gnu/lib/libregex"
+		SUBDIRS="${NATIVE_SUBDIRS}"
 	fi
 
 	for i in ${SUBDIRS} ; do