factorize the src_compile code between the cross and native builds.

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

3 files changed, 21 insertions, 24 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index d33ce1acd241..a76ebd6916f2 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,9 @@
 # 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.126 2012/05/17 19:04:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.127 2012/05/17 19:21:37 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  factorize the src_compile code between the cross and native builds.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   factorize the libssp_nonshared bootstrapping code
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 585e8a2cce3d..1d8a8227f099 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 13665 RMD160 9f667450d612f57d766894a4962795adfd54b4a5 SHA1 d209eba905dc087f052d1a28369f65c3a59e6e17 SHA256 07f25114e1ff1a6901c7e66c3933cb859f6e7a0e56c09c1c73ce18abd82c4b9a
-MISC ChangeLog 27030 RMD160 7a340c012a8bb9f22880a8176ac2d32c47c977cc SHA1 ffb5c6f7e37eb0c31cca7dd1e3d164c6fd79bb08 SHA256 9306cc79e73d3f8ace11947ae525eb55b0f27f15909ade911007695ea564764e
+EBUILD freebsd-lib-9.0-r2.ebuild 13239 RMD160 95151451b7511c1ea3259e642a3f0e8d73144cb5 SHA1 6c3951f0976ea2b84a1b81ed3d342cf52b1a664c SHA256 6968b4b2cfebc4ebf72101286831c1f81a6ebb7668c8e3fe4e1b6708c8bbdedc
+MISC ChangeLog 27180 RMD160 e82aec7f52564f60a6963cabda4810b07e9d262c SHA1 89b6a3f6d7236b610cd29fea7ff57c82ecbf41ed SHA256 99f81686e876d0404c15b9f4199a09cfb3cab47965b192bdb2138a59c88dd18f
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1S78ACgkQvFcC4BYPU0oF0wCeKHyIkoAtlnfmZ1mg7G9okRJc
-zmwAn0DyAqg5ZTOBAFE64l3CrgXDojbQ
-=l4Ll
+iEYEARECAAYFAk+1T8YACgkQvFcC4BYPU0ocNgCgyixvFMtkHeXRni5xCgQxykck
+o7kAn08wsIKH2CmUiuO2Xxh1/xhL8L8i
+=gBce
 -----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 132acdcb620e..998d8673ff22 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.12 2012/05/17 19:04:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.13 2012/05/17 19:21:37 aballier Exp $
 
 EAPI=2
 
@@ -241,7 +241,7 @@ src_compile() {
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
+		mymakeopts="${mymakeopts} NLS="
 
 		bootstrap_csu
 
@@ -249,17 +249,10 @@ src_compile() {
 
 		bootstrap_libssp_nonshared
 
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${S}/msun"
 		append-ldflags "-L${WORKDIR}/lib/libc"
 		export RAW_LDFLAGS=$(raw-ldflags)
-		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		for i in gnu/lib/libssp lib/libthr lib/libutil ; do
-			cd "${WORKDIR}/${i}" || die "missing ${i}."
-			$(freebsd_get_bmake) ${mymakeopts} || die "make ${i} failed"
-		done
+
+		SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
 	else
 		# Forces to use the local copy of headers as they might be outdated in
 		# the system
@@ -267,15 +260,16 @@ src_compile() {
 
 		bootstrap_libssp_nonshared
 
-		einfo "Compiling libc."
-		cd "${S}"
 		export RAW_LDFLAGS=$(raw-ldflags)
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
-		cd "${WORKDIR}/gnu/lib/libregex" || die
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
+
+		SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
 	fi
+
+	# Everything is now setup, build it!
+	for i in ${SUBDIRS} ; do
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
+	done
 }
 
 src_install() {