diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-11-18 03:28:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-11-18 03:28:02 +0000 |
| commit | 4f3e880409f554a84a3737b3ad0538da6e1a026f (patch) | |
| tree | a48cd07050a1cf56113cc38e37dc9c87f864440f | |
| parent | Pull in linux/types.h in linux/mroute.h. (diff) | |
| download | historical-4f3e880409f554a84a3737b3ad0538da6e1a026f.tar.gz historical-4f3e880409f554a84a3737b3ad0538da6e1a026f.tar.bz2 historical-4f3e880409f554a84a3737b3ad0538da6e1a026f.zip | |
check user CFLAGS so that we force -march= to match $CHOST
Package-Manager: portage-2.1.3.19
| -rw-r--r-- | sys-libs/glibc/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 16 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 7be240dd2789..629442a5a027 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -417,10 +417,10 @@ AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f631 MD5 1033e153c58605fd2ade988fa818f088 files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 -AUX eblits/common.eblit 7155 RMD160 f8b7d8a0d4056b89ba77b996bfa16ba58051091d SHA1 faa2ec204833d489238dc2d7af7c02eddb07044e SHA256 c0a3fddd148ccd08fe2b7c32d079bcaf2213f5f492aea319a6d30f92a9a45e6a -MD5 c4e0b0938e2d49dcaec4ab8d2c67ad06 files/eblits/common.eblit 7155 -RMD160 f8b7d8a0d4056b89ba77b996bfa16ba58051091d files/eblits/common.eblit 7155 -SHA256 c0a3fddd148ccd08fe2b7c32d079bcaf2213f5f492aea319a6d30f92a9a45e6a files/eblits/common.eblit 7155 +AUX eblits/common.eblit 7207 RMD160 7d44672811c82543595116181783e48c4de44af6 SHA1 4129a747fe1baf81c0ff99ef9f342070068567a5 SHA256 046e8be5ab5bf13ea7da84ac975c8e87cf6104e99b29b539d2c9c5d31980bb3b +MD5 60d96190e1395275777702d863bf9832 files/eblits/common.eblit 7207 +RMD160 7d44672811c82543595116181783e48c4de44af6 files/eblits/common.eblit 7207 +SHA256 046e8be5ab5bf13ea7da84ac975c8e87cf6104e99b29b539d2c9c5d31980bb3b files/eblits/common.eblit 7207 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 @@ -630,7 +630,7 @@ SHA256 2f7e23ec5516ec17421ac7f7677a7883604d33c13c6a1afb081752633632a02b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHN2I8p/wUKkr7RBoRAhrYAJ9tmGunXScz/c2utgPQoQXB3K24PACg4HuJ -88TJsTDqwUlhm+kgHQ+wsJU= -=GgrL +iD8DBQFHP7FHp/wUKkr7RBoRAlcIAJsEB+oIzG9hPQo0m/EO7I1IzqQbwACePlf3 +Vn+9Ga4ZTUI5VJx57cKHWc4= +=SZLc -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index be1a05376443..a6afdc245031 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.4 2007/10/10 19:52:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.5 2007/11/18 03:28:02 vapier Exp $ # We need to be able to set alternative headers for # compiling for non-native platform @@ -71,10 +71,11 @@ setup_flags() { case $(tc-arch) in x86) # -march needed for #185404 - if ! echo "" | $(tc-getCC) -E -dD - | grep -qs __i686__ ; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + if ! echo "" | $(tc-getCC) ${CFLAGS} -E -dD - | grep -qs __${t}__ ; then filter-flags '-march=*' - local t=${CTARGET_OPT:-${CTARGET}} - export CFLAGS="-march=${t%%-*} ${CFLAGS}" + export CFLAGS="-march=${t} ${CFLAGS}" fi ;; amd64) @@ -82,10 +83,11 @@ setup_flags() { CFLAGS_x86="-m32" # -march needed for #185404 - if ! echo "" | $(tc-getCC) -m32 -E -dD - | grep -qs __i686__ ; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + if ! echo "" | $(tc-getCC) ${CFLAGS} ${CFLAGS_x86} -m32 -E -dD - | grep -qs __${t}__ ; then filter-flags '-march=*' - local t=${CTARGET_OPT:-${CTARGET}} - export CFLAGS_x86="${CFLAGS_x86} -march=${t%%-*}" + export CFLAGS_x86="${CFLAGS_x86} -march=${t}" fi ;; ppc) |