diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2013-12-28 03:48:25 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2013-12-28 03:48:25 +0000 |
| commit | 7d9f167cb04b1187cf7d9a9872ff824a08cd8271 (patch) | |
| tree | 15975d260225e38cbce48948de2213c42ae387e7 /eclass/toolchain.eclass | |
| parent | Don't fail if gstreamer is not installed, since other phonon backends may hav... (diff) | |
| download | gentoo-2-7d9f167cb04b1187cf7d9a9872ff824a08cd8271.tar.gz gentoo-2-7d9f167cb04b1187cf7d9a9872ff824a08cd8271.tar.bz2 gentoo-2-7d9f167cb04b1187cf7d9a9872ff824a08cd8271.zip | |
Reintroduce texinfo patch to unbreak older versions (bug #496224).
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 942e657c0497..a57631d6569f 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.611 2013/12/27 22:54:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.612 2013/12/28 03:48:25 dirtyepic Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -553,6 +553,9 @@ toolchain_src_prepare() { done sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828 + # Prevent new texinfo from breaking old versions (see #198182, #464008) + tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch + if [[ -x contrib/gcc_update ]] ; then einfo "Touching generated files" ./contrib/gcc_update --touch | \ @@ -1150,8 +1153,6 @@ toolchain_src_configure() { # Disable gcc info regeneration -- it ships with generated info pages # already. Our custom version/urls/etc... trigger it. #464008 export gcc_cv_prog_makeinfo_modern=no - # Make sure we don't try to generate pages that don't even exist. #496224 - touch "${S}"/gcc/treelang/treelang.info 2>/dev/null # Do not let the X detection get in our way. We know things can be found # via system paths, so no need to hardcode things that'll break multilib. |