diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-05-18 11:24:30 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-05-18 11:24:30 +0000 |
| commit | 0a697491acb45b31a9c3e38d45576c62e25005a0 (patch) | |
| tree | 18cc7d7d9d2c1d9beec78d1f955e1779141570d7 /eclass | |
| parent | Bug #266654: Fix LPK compile under uclibc due to missing include statement th... (diff) | |
| download | gentoo-2-0a697491acb45b31a9c3e38d45576c62e25005a0.tar.gz gentoo-2-0a697491acb45b31a9c3e38d45576c62e25005a0.tar.bz2 gentoo-2-0a697491acb45b31a9c3e38d45576c62e25005a0.zip | |
Replace the “latest” string with the correct version during the autotools_run_tool.
Instead of doing that during the main evaluation, wait for it, so that
it's done at the very last moment; this solves bug #270010 properly,
without forcing an older automake version.
It should also be possible to move the latest handling into the
wrappers and use them if the new version is present, but that's
another problem.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/autotools.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index b27d4af5c27a..aaed91ab0c27 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.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/autotools.eclass,v 1.85 2009/05/04 22:27:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.86 2009/05/18 11:24:30 flameeyes Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -29,10 +29,10 @@ _autoconf_atom="sys-devel/autoconf" if [[ -n ${WANT_AUTOMAKE} ]]; then case ${WANT_AUTOMAKE} in none) _automake_atom="" ;; # some packages don't require automake at all + # if you change the “latest” version here, change also autotools_run_tool latest) _automake_atom="=sys-devel/automake-1.10*" ;; *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; esac - [[ ${WANT_AUTOMAKE} == "latest" ]] && WANT_AUTOMAKE="1.10" export WANT_AUTOMAKE fi @@ -40,10 +40,10 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then case ${WANT_AUTOCONF} in none) _autoconf_atom="" ;; # some packages don't require autoconf at all 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;; + # if you change the “latest” version here, change also autotools_run_tool latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;; *) _autoconf_atom="INCORRECT-WANT_AUTOCONF-SETTING-IN-EBUILD" ;; esac - [[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5" export WANT_AUTOCONF fi DEPEND="${_automake_atom} @@ -241,6 +241,11 @@ autotools_run_tool() { ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" fi + # We do the “latest” → version switch here because it solves + # possible order problems, see bug #270010 as an example. + [[ ${WANT_AUTOMAKE} == "latest" ]] && export WANT_AUTOMAKE=1.10 + [[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5 + local STDERR_TARGET="${T}/$1.out" # most of the time, there will only be one run, but if there are # more, make sure we get unique log filenames |