diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-14 16:06:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-14 16:06:06 +0000 |
| commit | 1d5147ea4ea2f741d8d8c3853e8be78756f17fc1 (patch) | |
| tree | 3cc9b6fa66f45591392bf9372fd26d14b7c811e5 /sys-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-1d5147ea4ea2f741d8d8c3853e8be78756f17fc1.tar.gz gentoo-2-1d5147ea4ea2f741d8d8c3853e8be78756f17fc1.tar.bz2 gentoo-2-1d5147ea4ea2f741d8d8c3853e8be78756f17fc1.zip | |
Fix inverted version logic with libgcc_eh #431304 by David Flogeras.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_unpack.eblit | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 5c9cdff5b2af..80a56b71b092 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,5 +1,8 @@ # ChangeLog for sys-libs/glibc -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.879 2012/08/13 22:48:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.880 2012/08/14 16:06:06 vapier Exp $ + + 14 Aug 2012; Mike Frysinger <vapier@gentoo.org> files/eblits/src_unpack.eblit: + Fix inverted version logic with libgcc_eh #431304 by David Flogeras. 13 Aug 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.10.1-r1.ebuild, glibc-2.11.3.ebuild, glibc-2.12.1-r3.ebuild, glibc-2.12.2.ebuild, diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit index 872b6aee766a..d927797150e5 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.17 2012/08/12 05:44:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.18 2012/08/14 16:06:06 vapier Exp $ int_to_KV() { local version=$1 major minor micro @@ -173,7 +173,7 @@ eblit-glibc-src_unpack() { # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html # 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 + if ! version_is_at_least 2.17 ; 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" |