Make a full bootstrap only when needed for multilib.

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 16 insertions, 15 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 81ac126110f9..18e3572e6b32 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.179 2013/06/18 19:15:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.180 2013/06/18 22:20:51 aballier Exp $
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+  Make a full bootstrap only when needed for multilib.
 
 *freebsd-lib-9.1-r8 (18 Jun 2013)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 8b7ff6037dd5..551afe5fbfc4 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -87,14 +87,14 @@ EBUILD freebsd-lib-9.1-r4.ebuild 18204 SHA256 2e9a27abe55de661e47c08996d77f00fff
 EBUILD freebsd-lib-9.1-r5.ebuild 17118 SHA256 e721a639a5fb82f213ce40bad39f02a520596463dccbb20e4abe53bd229d8445 SHA512 97caafda63a51f0c3ad35471b404ac5cea9de730ead9b8bac4042107ed0ddea3d956732435746e8f268e73ad9e24e1b8abd55a322f0c69fa7c7d62a7dc88bfa5 WHIRLPOOL d8b54d9d6d27b200ee7b3b4de3b2c2889ac9b49827ffb54fd37d3f234db10e24e4765fa9e5ebad846e87e01df79517495ce85a7cb6f86ee1e8f9b9b51f0d79a9
 EBUILD freebsd-lib-9.1-r6.ebuild 18624 SHA256 43186c9a26fe3f168eba9a526ee5a69021c40093c814431076d79ff1d25a2391 SHA512 28f56883c0fe2b20ab18108b2829a69960878867f1eca9d81f3dc6f159fb41ba2814751876a729e9ed894edabcb6922602e3c07e60502c70baf99288412d4162 WHIRLPOOL 47754469cd1b9ff711f89b881429223c2330ecd6f5320d20287e294286203a6a197c93c657ea0e8d78f2f828901f0974cff59bf251a3ba344f0730d9acc2ad0f
 EBUILD freebsd-lib-9.1-r7.ebuild 18634 SHA256 c587fa2a4ad95f8534e04188bc8fc9d7430b4a872cd1dd53a12e760be23e3ff3 SHA512 207c4d6f3c4d30c8c6d6c086cb757431de01fa11239bf3f76169fe15261cee6b4233c052013539dc02570f8a2d7c1b75052f4acf272abd909428c4c4176c4ddd WHIRLPOOL ae0af97d61dde7968cfb9c4df664a502acdbf4638b97d1c1384ad461ffea7eba82f58380eaeabc5c83a13a0148f6e9258ef9d40527fdb8662c75f0fbe2878ef9
-EBUILD freebsd-lib-9.1-r8.ebuild 18704 SHA256 03a6f1f0a2d03811c4deb6039a6bacd81a230b77a537bf304df9155705b81b21 SHA512 14b8329c68567c7f0abcd2ae7f8832a3a5390f225d85ae753ded5a3c97480c3ed843636e1f30cc3bad3d28fac95ebc24115728372924e47455fa85aad4f862ed WHIRLPOOL c887d77b432cf84ac6b1c752efa1573b610bfdac6afc15e1fb8499674f0e10380f1733cf515e4c0578ec19128886b41993e5fb69768cd16ae7ca8a2c7884648d
+EBUILD freebsd-lib-9.1-r8.ebuild 18611 SHA256 233ce5079a630aa6153bb557871c91db285f9b1906e277dd114ad3574c40800c SHA512 88e861de2c830b0ed449aad794a1bb0dff4cd359efc6a726e2431c8a9701392490854f17c5e45493150389d87b44e3b660293537de7ae2d6779eeb3b04aca014 WHIRLPOOL 4ce7fe73697032579bddba393019a3984f0f1364edfe135f384e1025bbb4183fc9ab2c9c246dcf5f8436d7a470ea4b284902601a864b741ee22a9d4fc9584cdf
 EBUILD freebsd-lib-9.1.ebuild 17157 SHA256 b1a74967940cb0eb70c6965b3f2add374bc2155afd975c44a90cf65c744ea632 SHA512 ecfb6745880c47dc965363744869cb491f05d60c03463779eb250b3c71d443436dbdc03ae4ce741d8c99d57897a84561e09412d0f825cc9e552c4d17e5253c2d WHIRLPOOL a17b3b88765e62d1f415c41bd5f4e1f9c8349b29eac65e2e064d282ac3af33b5eea532c613fe25d1e6ad2e56ad82263be15128ba5eada42d95023869491c40da
-MISC ChangeLog 37168 SHA256 d92adb6c7ac706463c4c3b939bbbc335f258fe8db71a786e702c68176ac5c1ae SHA512 68b15d1b18bb6e23bab60da0994abe73d6fa2e279ea2e02acc3e16a18dc185ae7bd1db60f42db46a9f5299b0da0854900bc7432d5c78cbeae59d77e1b9b41296 WHIRLPOOL c28e7f4ff9ee82cf0d6f94087ee077230fd2550e71c4c97a4b2ff150f0378cfe97eb0195c28f65e834af2b40bc1f63926f3260e8ea76a50341c99328a7879a1c
+MISC ChangeLog 37303 SHA256 3b8dcbdcee3ad146aa456a7a7438646746b0944928385878474e78e45c2ecd80 SHA512 fc1320e759e283805053e3f37585da4c3fa11734fb280173de94fcdb01b0db81871cc4546e9ceba9608533cfe71e0d93d45ba6a7ce511143ab381a5d8e917bdb WHIRLPOOL acb07d273f70d0fcd3c8ec9f8e7cb96f4b4cdbbed7dd4f3ba2d95a85a3ff71568410ac8c32f7c8b7db59253b039f6c9c3effbc92e099b8a99d3c288e2efb42ce
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHAseQACgkQvFcC4BYPU0pTTQCgr04UPrYmfuiN2VHl1s3gQlkE
-s+IAnA8/nHP4GI4KwsWraHS4w7pZo08S
-=QXQ9
+iEYEAREIAAYFAlHA3UUACgkQvFcC4BYPU0qHyQCgkH/sF9dsNpppEDwYZ/OTJAsJ
+u9wAoLVmgNEIFXN8jTEeMhkPDbG2uA5C
+=gSAc
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
index 41d3ff20dc14..2659d14b897a 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1-r8.ebuild,v 1.1 2013/06/18 19:15:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.2 2013/06/18 22:20:51 aballier Exp $
 
 EAPI=5
 
@@ -191,12 +191,6 @@ src_prepare() {
 		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
 	fi
 
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
 	cd "${S}"
 	use bootstrap && dummy_mk libstand
 	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
@@ -273,7 +267,7 @@ is_native_abi() {
 
 # Do we need to bootstrap the csu and libssp_nonshared?
 need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
+	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' ; } || has_version "<${CATEGORY}/${P}"
 }
 
 # Get the subdirs we are building.
@@ -333,7 +327,11 @@ do_bootstrap() {
 do_compile() {
 	# Bootstrap if needed, otherwise assume the system headers are in
 	# /usr/include.
-	need_bootstrap && do_bootstrap
+	if need_bootstrap ; then
+		do_bootstrap
+	else
+		CFLAGS="${CFLAGS} -isystem /usr/include"
+	fi
 
 	export RAW_LDFLAGS=$(raw-ldflags)