diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-12-22 20:59:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-12-22 20:59:02 +0000 |
| commit | f828508706cda90c3cdc3dd5f0f461a406b65ec8 (patch) | |
| tree | 08413f7bc5fd670a05050855eb25772687f2a0c2 | |
| parent | Fix/remove some broken gnu mirrors (diff) | |
| download | gentoo-2-f828508706cda90c3cdc3dd5f0f461a406b65ec8.tar.gz gentoo-2-f828508706cda90c3cdc3dd5f0f461a406b65ec8.tar.bz2 gentoo-2-f828508706cda90c3cdc3dd5f0f461a406b65ec8.zip | |
rework how we disable makeinfo; and disable it completely for older versions, not just releases #294617
| -rw-r--r-- | eclass/toolchain-binutils.eclass | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 9a7a48703920..cc1eee935adb 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.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-binutils.eclass,v 1.129 2013/12/22 16:51:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.130 2013/12/22 20:59:02 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> # @@ -223,12 +223,6 @@ _eprefix_init() { toolchain-binutils_src_configure() { _eprefix_init - # prevent makeinfo from running in releases. it may not always be - # installed, and older binutils may fail with newer texinfo. - # besides, we never patch the doc files anyways, so regenerating - # in the first place is useless. #193364 - find . '(' -name '*.info' -o -name '*.texi' ')' -exec touch -r . {} + - # make sure we filter $LINGUAS so that only ones that # actually work make it through #42033 strip-linguas -u */po @@ -310,6 +304,18 @@ toolchain-binutils_src_configure() { ) echo ./configure "${myconf[@]}" "${S}"/configure "${myconf[@]}" || die + + # Prevent makeinfo from running in releases. It may not always be + # installed, and older binutils may fail with newer texinfo. + # Besides, we never patch the doc files anyways, so regenerating + # in the first place is useless. #193364 + # For older versions, it means we don't get any info pages at all. + # Oh well, tough luck. #294617 + if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die + fi } toolchain-binutils_src_compile() { |