diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-12 05:44:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-12 05:44:34 +0000 |
| commit | 35d9c4f11b0bba715e37167538298c309d29fdee (patch) | |
| tree | 943add3d4b9e0fd065ab9a9d43dcadf7967160cc /sys-libs/glibc/files | |
| parent | Add s390/sh love. (diff) | |
| download | historical-35d9c4f11b0bba715e37167538298c309d29fdee.tar.gz historical-35d9c4f11b0bba715e37167538298c309d29fdee.tar.bz2 historical-35d9c4f11b0bba715e37167538298c309d29fdee.zip | |
Do not use the -lgcc_eh hack with glibc-2.17+ since its been addressed upstream.
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/glibc/files')
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_unpack.eblit | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit index 50500915c4bb..872b6aee766a 100644 --- a/sys-libs/glibc/files/eblits/src_unpack.eblit +++ b/sys-libs/glibc/files/eblits/src_unpack.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.16 2012/02/16 00:27:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.17 2012/08/12 05:44:34 vapier Exp $ int_to_KV() { local version=$1 major minor micro @@ -171,9 +171,13 @@ eblit-glibc-src_unpack() { # static C-Only gcc, -lgcc_eh doesn't exist. # http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - echo 'int main(){}' > "${T}"/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" + # But! Finally fixed in recent versions: + # http://sourceware.org/ml/libc-alpha/2012-05/msg01865.html + if version_is_at_least 2.17 ${PV} ; then + echo 'int main(){}' > "${T}"/gcc_eh_test.c + if ! $(tc-getCC ${CTARGET}) "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then + sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" + fi fi cd "${WORKDIR}" |