Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
Date: Sun, 01 Mar 2009 20:41:28
Message-Id: E1LdsTW-0002Jc-4s@stork.gentoo.org
1 vapier 09/03/01 20:41:26
2
3 Modified: toolchain.eclass
4 Log:
5 apply configure texinfo patch for gcc-4.1+ #260296
6
7 Revision Changes Path
8 1.393 eclass/toolchain.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.393&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.393&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.392&r2=1.393
13
14 Index: toolchain.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
17 retrieving revision 1.392
18 retrieving revision 1.393
19 diff -u -r1.392 -r1.393
20 --- toolchain.eclass 1 Mar 2009 20:37:50 -0000 1.392
21 +++ toolchain.eclass 1 Mar 2009 20:41:26 -0000 1.393
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2008 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.392 2009/03/01 20:37:50 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.393 2009/03/01 20:41:26 vapier Exp $
27 #
28 # Maintainer: Toolchain Ninjas <toolchain@g.o>
29
30 @@ -1120,10 +1120,7 @@
31 # disable --as-needed from being compiled into gcc specs
32 # natively when using a gcc version < 3.4.4
33 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992
34 - if [[ ${GCCMAJOR} < 3 ]] || \
35 - [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] || \
36 - [[ ${GCCMAJOR}.${GCCMINOR}.${GCCMICRO} < 3.4.4 ]]
37 - then
38 + if ! tc_version_is_at_least 3.4.4 ; then
39 sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in
40 fi
41
42 @@ -1144,7 +1141,7 @@
43 # update configure files
44 local f
45 einfo "Fixing misc issues in configure files"
46 - [[ ${GCCMAJOR} -ge 4 ]] && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
47 + tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
48 for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
49 ebegin " Updating ${f/${S}\/} [LANG]"
50 patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \