factorize pre-installation of headers in the bootstrap function

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

3 files changed, 19 insertions, 16 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index ab546953b1e3..3b893f1d934b 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.154 2012/06/11 13:33:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.155 2012/06/11 13:52:38 aballier Exp $
+
+  11 Jun 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+  factorize pre-installation of headers in the bootstrap function
 
   11 Jun 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
   drop another append-flags usage, being too clever it strips and breaks the
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index b74a8cf5d329..cbf9a5e08b42 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -63,13 +63,13 @@ DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc22
 EBUILD freebsd-lib-7.2-r1.ebuild 12031 RMD160 7ed76ca70dbca490d9e222c6200a825b82a88764 SHA1 1284cead9714572ff395254ed17f2e688a04c93d SHA256 90e8cc58e6e8c1739af88cc52921a4cb71f89657188dd6a34161fdfd5b1b1361
 EBUILD freebsd-lib-8.0.ebuild 14711 RMD160 546c0e959156a4138331b6ba6ca0d55a53fb3a18 SHA1 c316876d83231db0d225e5b2fb49762903fee037 SHA256 a2f84d09876185ce43467375362842642a00a9400c846fa2ce587f8ec2dce981
 EBUILD freebsd-lib-8.2-r1.ebuild 15781 RMD160 6b636dac242c89a203e3bb532c6413df1614a2ab SHA1 cee76f7c3a2302a98d7fc7a3d384d9bb93ec9e70 SHA256 77b9417b08a2cecb3411284d284a7374190573fb70c7d4e540db9704d10e5083
-EBUILD freebsd-lib-9.0-r3.ebuild 16967 RMD160 aba8e0ff2ee6a10f6628ce1089db929ad9e47782 SHA1 edfb540c26a0b863b14faf51d36f4784f331e075 SHA256 f90e8a4594179244760771a0abba4072399fb05b3ab6863f92fedcf012fc111d
-MISC ChangeLog 32122 RMD160 c2377d97eac436aeb1a7841b96363036b7c12540 SHA1 4bd4a99f8cbecea4c0594bb4576e7e0dfb162b67 SHA256 744d4e684b724433fefdfdd44d2b88062fbd3189201ca9109bf38b1f7234482d
+EBUILD freebsd-lib-9.0-r3.ebuild 16873 RMD160 c33beebfcb522c93ce83ebe417f7924edfa18db9 SHA1 acb7dddf5ddd1356fb65a78e781714f09f7f7c37 SHA256 7c710bad37642738a659b2017f1d4245c2b5e0173c4bb49f461df22fe1667f3a
+MISC ChangeLog 32268 RMD160 62f8788df90be1625b57cb90f0e8aec846e2e256 SHA1 103d16b7a7a41fa0ee5fa9594c3e45a35529e637 SHA256 ec03923597458cb8cb19d916990f805cda0287d968078ace01b2b3eb04181d9a
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/V88UACgkQvFcC4BYPU0rG6QCeKje0VJSNP6kgs3rtOMjLkNa/
-r7kAn0WIJK6mkY4DoByvksxxStGhbkzU
-=nhl0
+iEYEARECAAYFAk/V+CsACgkQvFcC4BYPU0rm4ACeM5cgoeBeIwCQljTE9z8s6/my
+XwEAnivJPD93nQcSq4+8DoEvbPZZxrnx
+=IRGR
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
index c9f0d4f33075..5908b995cb88 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.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-r3.ebuild,v 1.5 2012/06/11 13:33:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.6 2012/06/11 13:52:38 aballier Exp $
 
 EAPI=2
 
@@ -168,9 +168,6 @@ src_prepare() {
 		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
 		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
 		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		# Preinstall includes so we don't use the system's ones.
-		mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
-		install_includes "/include_proper"
 		return 0
 	fi
 
@@ -284,6 +281,14 @@ get_subdirs() {
 # build against it.
 do_bootstrap() {
 	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
+	if ! is_crosscompile ; then
+		# Pre-install headers, but not when building a cross-compiler since we
+		# assume they have been installed in the previous pass.
+		einfo "Pre-installing includes in include_proper_${ABI}"
+		mkdir "${WORKDIR}/include_proper_${ABI}" || die
+		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
+		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+	fi
 	bootstrap_csu
 	bootstrap_libssp_nonshared
 }
@@ -351,16 +356,11 @@ src_compile() {
 			CFLAGADD=""
 			if ! is_native_abi ; then
 				mymakeopts="${mymakeopts} COMPAT_32BIT="
-				einfo "Pre-installing includes in include_proper_${ABI}"
-				mkdir "${WORKDIR}/include_proper_${ABI}" || die
-				CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-				CFLAGADD="-isystem ${WORKDIR}/include_proper_${ABI}"
 			else
-				use build && CFLAGADD="-isystem ${WORKDIR}/include_proper" || CFLAGADD="-isystem /usr/include";
+				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
 			fi
 
 			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
-			CFLAGS="${CFLAGS} ${CFLAGADD}"
 
 			CTARGET="${CHOST}" do_compile