split out the csu bootstrapping code in its own function

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

3 files changed, 21 insertions, 16 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 9fd5aeee4df0..a336faf139a6 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.123 2012/05/17 18:13:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.124 2012/05/17 18:31:44 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  split out the csu bootstrapping code in its own function
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Remove -isystem append-flags that are now useless since we pre-install the
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index c719b881b169..1400ae9dad5f 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 13949 RMD160 a9a196b447461b2eb83528da4f75d0926e0c89b0 SHA1 1e34f7e47ba2595d73fc958f0da7525dbccf105d SHA256 66a34cc4f818b89fcee23ab45cb16c373e127d8dbe719f96b914e88319cc6474
-MISC ChangeLog 26631 RMD160 9893a4d3bee815522fc721553647f670a83f31a1 SHA1 2edc07c3fcc22dbf731e5b5df9c0c2148bcb3c6e SHA256 8d275b1549e50bd48dd922208a220bc801dc1a500f70ab7cc675d43db833cecd
+EBUILD freebsd-lib-9.0-r2.ebuild 13904 RMD160 188880b9f42186619c3923162e7c8fdfc3d58f3c SHA1 1371a04ac6a3d7ce1006cf714ea53923b4e8bf2a SHA256 299ad1f3baf3b171579383d9f0c82d6bc8869ddbfe396a08354c60a80b53c072
+MISC ChangeLog 26770 RMD160 8ba8bd1f414738ab922532a997d25b7019f0b385 SHA1 dd427712c476f13182c71c0247c157e0aabd31d2 SHA256 4361df34ec18136bca6e55b198f63628236bed4c844f116e35190d10cb5fb34a
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1P7EACgkQvFcC4BYPU0q6+ACdHqK/1Glc39cvhypGTM8QQNU7
-eIoAoMMQnLLq27QIrk7u+NCrhvnss8sb
-=IuZR
+iEYEARECAAYFAk+1RBcACgkQvFcC4BYPU0og+wCfX1aBIZ4J9UvErVSbd4Uq0KH3
+4MUAnAhtZGrYjFthH8of/iDpNLv36C+7
+=sOE8
 -----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 66277396f6e8..830f35c54b4f 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.9 2012/05/17 18:13:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.10 2012/05/17 18:31:44 aballier Exp $
 
 EAPI=2
 
@@ -204,6 +204,16 @@ get_csudir() {
 	fi
 }
 
+bootstrap_csu() {
+	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
+	export RAW_LDFLAGS=$(raw-ldflags)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	append-flags "-B ${WORKDIR}/${csudir}"
+	append-ldflags "-B ${WORKDIR}/${csudir}"
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -226,17 +236,9 @@ src_compile() {
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
 
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir="$(get_csudir ${machine})"
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+		bootstrap_csu
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-B ${WORKDIR}/${csudir}"
-		append-ldflags "-B ${WORKDIR}/${csudir}"
 
 		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
 		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."