Treat multilib and non multilib builds the same way as multilib.eclass does the right thing. Go back to -isystem for system includes and force to use ours as otherwise we may pick gcc ones and it got that wrong. Bypass append-flags and append cflags directly as flag-o-matic eclass maintainers think it wise to add broken checks that break with flags with spaces.

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

3 files changed, 18 insertions, 14 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 727176b95dcd..830b80dbd932 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.152 2012/05/28 03:17:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.153 2012/05/30 12:25:14 aballier Exp $
+
+  30 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+  Treat multilib and non multilib builds the same way as multilib.eclass does
+  the right thing. Go back to -isystem for system includes and force to use
+  ours as otherwise we may pick gcc ones and it got that wrong. Bypass
+  append-flags and append cflags directly as flag-o-matic eclass maintainers
+  think it wise to add broken checks that break with flags with spaces.
 
   28 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
   fix broken logic in is_native_abi, by Naohiro Aota, bug #417863
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 594050d1dd50..fc1a442cc9c9 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 17104 RMD160 3a7f36d277cde2f96733760afa6636f9f9f2f56f SHA1 a3f5298549aef2f50e0f7b3e99fd44e62fb0348c SHA256 342a2561178bb9570a1cda2c4a1ba6aee670a0c78cbc56446335b78d66911325
-MISC ChangeLog 31458 RMD160 bc6d20792c02394eef151f374ae4f541413c4991 SHA1 79f46e0a71b11e146082ab67658fc758b45f8c45 SHA256 5aee30cac07b5bf678d0e7fe14ac2e9c2871076aa0f5f7c27de6295194f4e014
+EBUILD freebsd-lib-9.0-r3.ebuild 16963 RMD160 0c25ff281791f28da19cb9056cc40d76f1ef8e4a SHA1 49804f17be6205bee68675e18ac5b0ff7d3a0fd8 SHA256 3eed048bcc0f392d97f57ba6211620cf4e69e73327c8c6cf73ad8af734e0d0c6
+MISC ChangeLog 31912 RMD160 e4bff0dfe873968fed10f81f084d0cd1ab572cb5 SHA1 29c34b2b3e8a5fb59ef8030b462996400b3d3eee SHA256 875816c0e191cda92b4a88af054992c328e145017acdd2a8e961e85071da42fc
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/C7lkACgkQvFcC4BYPU0poWwCeLilz5aUQWiG6/J8mXAzBWP6D
-BxYAoM1FWtdtCqyYtaEIo6Ya7dlkKvsj
-=ST+U
+iEYEARECAAYFAk/GEbAACgkQvFcC4BYPU0o82QCfUzavv/IBKaQGzBIvJRlA/rcJ
+o8EAnj3rm/rLW/KCqbomobnVoLaTVcit
+=UAxV
 -----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 bbebcce53574..b4f18e4d21b8 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.3 2012/05/28 03:17:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.4 2012/05/30 12:25:14 aballier Exp $
 
 EAPI=2
 
@@ -337,11 +337,6 @@ src_compile() {
 
 	if is_crosscompile ; then
 		do_compile
-	elif ! use multilib ; then
-		# Forces to use the local copy of headers with USE=build as they might
-		# be outdated in the system. Assume they are fine otherwise.
-		use build && append-flags "-I${WORKDIR}/include_proper"
-		do_compile
 	else
 		for ABI in $(get_all_abis) ; do
 			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
@@ -353,17 +348,19 @@ src_compile() {
 
 			local target="$(tc-arch-kernel ${CHOST})"
 			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
+			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}"
-				CC="${CC} -I${WORKDIR}/include_proper_${ABI}"
+				CFLAGADD="-isystem ${WORKDIR}/include_proper_${ABI}"
 			else
-				use build && append-flags "-I${WORKDIR}/include_proper" ;
+				use build && CFLAGADD="-isystem ${WORKDIR}/include_proper" || CFLAGADD="-isystem /usr/include";
 			fi
 
 			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
+			CFLAGS="${CFLAGS} ${CFLAGADD}"
 
 			CTARGET="${CHOST}" do_compile