diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-03-01 20:41:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-03-01 20:41:26 +0000 |
| commit | 255c2e4ff10b8ebd8a6be99b20d79389f4a681c5 (patch) | |
| tree | a8929ec16d1692854974b5ee04637c159bdf424d /eclass/toolchain.eclass | |
| parent | filter more flags for gcc-3.3 (diff) | |
| download | gentoo-2-255c2e4ff10b8ebd8a6be99b20d79389f4a681c5.tar.gz gentoo-2-255c2e4ff10b8ebd8a6be99b20d79389f4a681c5.tar.bz2 gentoo-2-255c2e4ff10b8ebd8a6be99b20d79389f4a681c5.zip | |
apply configure texinfo patch for gcc-4.1+ #260296
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 118bb5a728c4..aa5dd2c96fe8 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.392 2009/03/01 20:37:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.393 2009/03/01 20:41:26 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1120,10 +1120,7 @@ gcc_src_unpack() { # disable --as-needed from being compiled into gcc specs # natively when using a gcc version < 3.4.4 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 - if [[ ${GCCMAJOR} < 3 ]] || \ - [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] || \ - [[ ${GCCMAJOR}.${GCCMINOR}.${GCCMICRO} < 3.4.4 ]] - then + if ! tc_version_is_at_least 3.4.4 ; then sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in fi @@ -1144,7 +1141,7 @@ gcc_src_unpack() { # update configure files local f einfo "Fixing misc issues in configure files" - [[ ${GCCMAJOR} -ge 4 ]] && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch + tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do ebegin " Updating ${f/${S}\/} [LANG]" patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \ |