diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-10-07 03:18:51 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-10-07 03:18:51 +0000 |
| commit | 240a610de208b356b9a2a65c075f90dec23f4d5d (patch) | |
| tree | 396a97b30262b199061271e70c2d4bd98cf44ed5 /sys-libs | |
| parent | Add needed quotes; don't specify the default for DESTTREE; add die messages. (diff) | |
| download | historical-240a610de208b356b9a2a65c075f90dec23f4d5d.tar.gz historical-240a610de208b356b9a2a65c075f90dec23f4d5d.tar.bz2 historical-240a610de208b356b9a2a65c075f90dec23f4d5d.zip | |
tweak the fix for #185404 a bit
Package-Manager: portage-2.1.3.11
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 9 |
2 files changed, 13 insertions, 10 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index e56ade73c94c..38780ea2fc79 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -413,10 +413,10 @@ AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292af MD5 cebca9f412d4c393f32f9cca68575a5f files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 -AUX eblits/common.eblit 6823 RMD160 dbe357daf79e47f133bfb5d0d8298a26aa1cfd64 SHA1 ec7aaccd15e4a95ac2ba7639509971b5e0e4af92 SHA256 f5256726564b295fef43cc31e3ca7630ba4b1255a36a2570f3f01ab7adec30b0 -MD5 92848dadc8dae41a6d60e45dd25dd580 files/eblits/common.eblit 6823 -RMD160 dbe357daf79e47f133bfb5d0d8298a26aa1cfd64 files/eblits/common.eblit 6823 -SHA256 f5256726564b295fef43cc31e3ca7630ba4b1255a36a2570f3f01ab7adec30b0 files/eblits/common.eblit 6823 +AUX eblits/common.eblit 6925 RMD160 aa5ec0ec7838e95567fc016b91007af04baef8af SHA1 db2e8da7209a382996b84f402f98328a30dfe7cc SHA256 aa63c581b0040d1157af915859ff534a92a31631d37715c9ab06375edfa626e0 +MD5 435110c649fac2470ffda46172dd4fa5 files/eblits/common.eblit 6925 +RMD160 aa5ec0ec7838e95567fc016b91007af04baef8af files/eblits/common.eblit 6925 +SHA256 aa63c581b0040d1157af915859ff534a92a31631d37715c9ab06375edfa626e0 files/eblits/common.eblit 6925 AUX eblits/src_compile.eblit 5096 RMD160 74e71857dcbf538349771437cd08b01f6b277087 SHA1 8b2b2f86a27e3ee6096baf5b673665feb1c7629f SHA256 fef68741aa40cd42f85fe39a3b33291122565a26894aaa0a0404f7d4d552049b MD5 4891968e3cff1e9ad5b22fbc7abc2111 files/eblits/src_compile.eblit 5096 RMD160 74e71857dcbf538349771437cd08b01f6b277087 files/eblits/src_compile.eblit 5096 @@ -615,7 +615,7 @@ SHA256 2419cc2d213b8e7d1b10750a28497b95829771603d40e334894096003bfb6288 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFG++L9p/wUKkr7RBoRAn5vAKDe17wIXpRcSNy5wBtP+SnbKRgaCACfcDmu -XqgH9GAYmFzuWougrGf60jM= -=lujc +iD8DBQFHCFAgp/wUKkr7RBoRAg51AJ9YoVnGcSWXt+W8u5ifvqJy1Vn4oACfSoAE +aeMZW7CWZw+DRx6jThL54FI= +=hqQh -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index 5b254113fe55..8356095376e6 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.2 2007/08/06 09:50:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.3 2007/10/07 03:18:51 vapier Exp $ # We need to be able to set alternative headers for # compiling for non-native platform @@ -71,8 +71,11 @@ setup_flags() { case $(tc-arch) in x86) # -march needed for #185404 - local t=${CTARGET_OPT:-${CTARGET}} - export CFLAGS="-march=${t%%-*} ${CFLAGS}" + if ! echo "" | $(tc-getCC) -E -dD - | grep -qs __i686__ ; then + filter-flags '-march=*' + local t=${CTARGET_OPT:-${CTARGET}} + export CFLAGS="-march=${t%%-*} ${CFLAGS}" + fi ;; amd64) # Punt this when amd64's 2004.3 is removed |