When we filter flags, make sure we update CFLAGS_x86 to avoid endlessly appending it as reported by Anush Elangovan.

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

3 files changed, 13 insertions, 7 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index df73c4aed405..e2e2fa50d929 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.794 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.795 2011/11/17 21:22:53 vapier Exp $
+
+  17 Nov 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+  When we filter flags, make sure we update CFLAGS_x86 to avoid endlessly
+  appending it as reported by Anush Elangovan.
 
   16 Nov 2011; Mike Frysinger <vapier@gentoo.org>
   glibc-2.9_p20081201-r3.ebuild, glibc-2.10.1-r1.ebuild, glibc-2.11.3.ebuild,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9de58c5aa83c..6e23b6a6009d 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 9211 RMD160 5f3e02db1636eed143fdc5e5c6f3f271c299aea7 SHA1 c427bae5c94cb2931254535988bfdf6760259beb SHA256 c8fdc3a6856310ad6e52710260fa512c62148e60508662f66b16d0913c45ed9b
+AUX eblits/common.eblit 9323 RMD160 aa42c1ca5b73b68bb6d022355dfa7e149091f23c SHA1 1849da38c293bcfddc0b6446d4e1862d28f0fbe5 SHA256 d3841f2d4d9065754e57b5d9143c54eb278daabde81cf0d27179e281ddd0875a
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730
 AUX eblits/pkg_setup.eblit 3146 RMD160 f0575822d5364b5167c17ea7b0aabd821b61fb19 SHA1 e5e55694c18a4c7b8df2e76586866894b018f04e SHA256 c4a59e35b3c5847fa24cc35fb4af4c190a057587453ac8c463244189ff627d74
@@ -59,12 +59,12 @@ EBUILD glibc-2.14.1.ebuild 8791 RMD160 1a8102b2ab8f4b090a72e27b599b3006c2e87b00
 EBUILD glibc-2.14.ebuild 8790 RMD160 c808dcea9320f1f8a870b54ca50c023d10b034f1 SHA1 51f3046ddfe9f53224dc77f8b8e8881dfb6bd021 SHA256 b7f9c2a47dd0d5a6e1927db3cab51a8b7cb52d827df8213df0827e83754d901b
 EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 8d14a32be1c680e21128552fff3e7299710b0255 SHA1 92f5182dce11c5a77e91ebd9129c2c6ff6938974 SHA256 b90aa298fd49569090f711b2bd9368a66c73cb6c37e85525d1d929ef70e09a5b
 EBUILD glibc-9999.ebuild 8789 RMD160 cb7c0aa7866c031533846c94dd632d26cde8b064 SHA1 e3619da20d49aa6b358b6c95b83c94bf34e5bfe4 SHA256 9e7a7444b0aeb1cd27e5689a94a029c637627971f4fd1fb2e4361a0e7b3d6fc9
-MISC ChangeLog 142087 RMD160 36ef42b6c6c6efa60ce0b5ca49e5c81c0a9fe417 SHA1 f7527143278bd7dae6903f2c874c4fd6bfb16ce5 SHA256 e6b33658e62cade0153d024ed40dbeaef95140c24af45105cad751567546b5a6
+MISC ChangeLog 142286 RMD160 6d039de0e9b6abf206485ec68d5d96fed491ba45 SHA1 c7b120e972e3384e4906da4918aec2082d8a32ec SHA256 ee725346b4c1033afdfbc1051027f8ee60fca8500531d54e9eb3d9021159351a
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7D390ACgkQaC/OocHi7JYvEAD+LXoekN6hMFl4RvuTUUWWSYr9
-U1zS06auf/WRbnP2ntUA/2wgbjL7vqz56jstesqQcR6bzZK0ZJuNvqZ5Ldd6fM/r
-=Nabd
+iF4EAREIAAYFAk7FezQACgkQaC/OocHi7JZ0xwD/Z8oV4pZ+FWRZovrMKyfAZhxH
+hgvcgAXWEH5uDWHtHmwBAI8lkKjWP0z/noMrPUKb8UAn1ig0GnDbFlZPvuWqpQYT
+=g1JK
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 3aa16ef69c33..47ea221cca44 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.23 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.24 2011/11/17 21:22:53 vapier Exp $
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
@@ -61,6 +61,8 @@ setup_target_flags() {
 				local t=${CTARGET_OPT:-${CTARGET}}
 				t=${t%%-*}
 				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
 				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
 				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
 			fi