factorize the libssp_nonshared bootstrapping code

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

3 files changed, 22 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 0fec75aa85bd..d33ce1acd241 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.125 2012/05/17 18:46:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.126 2012/05/17 19:04:25 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  factorize the libssp_nonshared bootstrapping code
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   use freebsd_src_install rather than mkinstall
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 2c1d29555758..585e8a2cce3d 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 13883 RMD160 25142e3151635912510bdf07e8282478d9a116a2 SHA1 e0c8f90c552a6eae701c4cb2d2a0be060fa11eda SHA256 ca4d59fe57857c54529de5383121ce703bd7d75497f290d4a670e914179fd9c2
-MISC ChangeLog 26898 RMD160 318ee52eadadd9c02de3ec4df1de5885af83b86a SHA1 abd626fad712515d690bc3fe2676cb425c5cca91 SHA256 d17eb24a2d75b26b07753ebf56e6cf11e596a81dfdcabba42cee9f71204810b8
+EBUILD freebsd-lib-9.0-r2.ebuild 13665 RMD160 9f667450d612f57d766894a4962795adfd54b4a5 SHA1 d209eba905dc087f052d1a28369f65c3a59e6e17 SHA256 07f25114e1ff1a6901c7e66c3933cb859f6e7a0e56c09c1c73ce18abd82c4b9a
+MISC ChangeLog 27030 RMD160 7a340c012a8bb9f22880a8176ac2d32c47c977cc SHA1 ffb5c6f7e37eb0c31cca7dd1e3d164c6fd79bb08 SHA256 9306cc79e73d3f8ace11947ae525eb55b0f27f15909ade911007695ea564764e
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1R3sACgkQvFcC4BYPU0q2yACfcOSvs08xZ7HkxOKeqwBsLEvq
-5yEAn0w0JVSi0A9NB5wU6SbZ6zTadSPJ
-=TkPf
+iEYEARECAAYFAk+1S78ACgkQvFcC4BYPU0oF0wCeKHyIkoAtlnfmZ1mg7G9okRJc
+zmwAn0DyAqg5ZTOBAFE64l3CrgXDojbQ
+=l4Ll
 -----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 cdd0102d604b..132acdcb620e 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.11 2012/05/17 18:46:14 aballier Exp $
+# $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 $
 
 EAPI=2
 
@@ -214,6 +214,13 @@ bootstrap_csu() {
 	append-ldflags "-B ${WORKDIR}/${csudir}"
 }
 
+# Compile libssp_nonshared.a and add it's path to LDFLAGS.
+bootstrap_libssp_nonshared() {
+	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+	NOFLAGSTRIP=yes freebsd_src_compile
+	append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -240,10 +247,7 @@ src_compile() {
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
 
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+		bootstrap_libssp_nonshared
 
 		export RAW_LDFLAGS=$(raw-ldflags)
 		cd "${S}/libc"
@@ -261,17 +265,14 @@ src_compile() {
 		# the system
 		append-flags "-isystem '${WORKDIR}/include_proper'"
 
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"."
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		NOFLAGSTRIP=yes freebsd_src_compile
-		# Hack libssp_nonshared.a into libc & others since we don't have
-		# the linker script in place yet.
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+		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
 	fi