summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-17 21:22:53 +0000
committerMike Frysinger <vapier@gentoo.org>2011-11-17 21:22:53 +0000
commit5bc5f95fd974c73d46c9affc6b6245aa38df0a2b (patch)
tree9d2127efbb3bef80e2392e5600e592c5adc506d4 /sys-libs
parentClean up gentoo patch to set SONAME, but not diff from the files actually ins... (diff)
downloadgentoo-2-5bc5f95fd974c73d46c9affc6b6245aa38df0a2b.tar.gz
gentoo-2-5bc5f95fd974c73d46c9affc6b6245aa38df0a2b.tar.bz2
gentoo-2-5bc5f95fd974c73d46c9affc6b6245aa38df0a2b.zip
When we filter flags, make sure we update CFLAGS_x86 to avoid endlessly appending it as reported by Anush Elangovan.
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog6
-rw-r--r--sys-libs/glibc/files/eblits/common.eblit4
2 files changed, 8 insertions, 2 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/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