Split out the target-specific flag munging into its own func to make the common logic easier to understand, and skip it altogether for headers targets since we wont have a compiler which can accept the flags in the first place.

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

3 files changed, 48 insertions, 35 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index d5c4cdccc592..f66f5cd4db36 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.756 2011/03/10 07:35:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.757 2011/03/10 08:04:16 vapier Exp $
+
+  10 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+  Split out the target-specific flag munging into its own func to make the
+  common logic easier to understand, and skip it altogether for headers targets
+  since we wont have a compiler which can accept the flags in the first place.
 
   10 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
   Handle "default" ABI for sparc64 targets without falling back to a sparc32
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index a761ca34fa91..19996b794d5d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,7 +15,7 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 RMD160 8746aeb9f9c68ca153d93cf92c9df93
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
-AUX eblits/common.eblit 8859 RMD160 590e09bda3280872d3eb3a9a160465281a75af3c SHA1 9307479443713cd556682e006b175a5d3af64054 SHA256 1905487ffb3feb9145451def8c15b17215b5bfc7d222f0ffde376789fe42f24b
+AUX eblits/common.eblit 9042 RMD160 da37fec1de02056b30a8a212659a6862fae21501 SHA1 bf98624870084acbefb5b2c89c69fc8cd3de5136 SHA256 2f6afd5fb4b8d865127063073ef2c9f2f01070113494cf5af734ba5b5ac4b3ad
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3764 RMD160 f9a9d43e2d2d8df073be7e1b66655e651cb10740 SHA1 b987e2802201e0f44c357ffc7b92da4aa77cf377 SHA256 41baa253ea529156d628108247545235c4ec377b184e7824bd790eba1361299e
 AUX eblits/pkg_setup.eblit 3086 RMD160 24a50d7a2c5e824e83573e9b69eb47cb0f4b225f SHA1 33624942a8a828fc3328bd1e61a8da2f00f56e61 SHA256 7b25d97376e2da04c6f94a0bfd8a94dcf32f4ce0a524677548d240a6abbc6d6d
@@ -82,12 +82,12 @@ EBUILD glibc-2.7-r2.ebuild 12941 RMD160 461ae1f64ad710426a485eb5593f1e13c4a618d8
 EBUILD glibc-2.8_p20080602-r1.ebuild 13488 RMD160 6b58dc46eb346a67557e5ce6b84a10a3688d649a SHA1 a89f61f4add7950715fedd27a4cc9fb68599f4c1 SHA256 f560d233bb3b0bcdda61fe6d052f54c253d43c9b31f7a2070e9b2f4003131b30
 EBUILD glibc-2.9_p20081201-r2.ebuild 7772 RMD160 ad3a0203d514fea907712ada8a9c3970267aa823 SHA1 690094c7a7b7c5a0b016f41ba519d4ecaa8a1cea SHA256 bb909d9117328ca426af80e6b6d78cb3a96b0efe03d511ead4bf8d62341f42a2
 EBUILD glibc-2.9_p20081201-r3.ebuild 7806 RMD160 6d696692a2e122bfdc149aea75368cea00bce92c SHA1 0df0da8ccd0a95084f849bdb92bfc3389efba74f SHA256 995c0e939cc7146e347d3f8caafbf4ad720a7caa7dfd0a9562f5a2877533a45c
-MISC ChangeLog 135779 RMD160 14449e9310ba050dd131f1f52070cfba7014ed28 SHA1 62757554025816d94fe910bbd1c6d08d5aa175e1 SHA256 f352c802d784f37736462a9bc74b921ae303886c24a85928cc2b196a9d8a4a78
+MISC ChangeLog 136091 RMD160 827ea62d650231796f90717a63fffca1c0023c14 SHA1 8b3cfe6994367808508f6821eb9643a5272df3ec SHA256 b596b5315fcda63ba123f0f55857812da73b678213900c4ca4e7d0fbef12cdf2
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk14f2kACgkQaC/OocHi7JYIFQEAjhsyG7xceeVNHtMDzBkUmpLV
-F1qc31ZmQhnWA1WWR7gA/RZrW5JI4Jg+hCZXlJEHDKCyCH4kdcUrdZBE5awRfVwB
-=tn31
+iF4EAREIAAYFAk14hgEACgkQaC/OocHi7JbtrwD+NOZ8JjsDEK3tVy0/+pV7zhA5
+LYHSdjXhLsdy9kpSsOAA+wUeXga60thDzXeZJmu4WFDOM7mDFQqRARWtfXbp49Pw
+=9h9p
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index b2472e162218..25ae8d88f279 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.15 2011/03/10 07:35:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.16 2011/03/10 08:04:16 vapier Exp $
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
@@ -39,34 +39,10 @@ alt_usrlibdir() {
 	fi
 }
 
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Over-zealous CFLAGS can often cause problems.  What may work for one
-	# person may not work for another.  To avoid a large influx of bugs
-	# relating to failed builds, we strip most CFLAGS out to ensure as few
-	# problems as possible.
-	strip-flags
-	strip-unsupported-flags
-	filter-flags -m32 -m64 -mabi=*
-
-	unset CBUILD_OPT CTARGET_OPT
-	if has_multilib_profile ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
 
 	case $(tc-arch) in
 		x86)
@@ -155,6 +131,38 @@ setup_flags() {
 			fi
 		;;
 	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Over-zealous CFLAGS can often cause problems.  What may work for one
+	# person may not work for another.  To avoid a large influx of bugs
+	# relating to failed builds, we strip most CFLAGS out to ensure as few
+	# problems as possible.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -m32 -m64 -mabi=*
+
+	unset CBUILD_OPT CTARGET_OPT
+	if has_multilib_profile ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
 
 	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
 		CBUILD_OPT=${CTARGET_OPT}