| 1 |
flameeyes 09/05/18 11:24:30 |
| 2 |
|
| 3 |
Modified: autotools.eclass |
| 4 |
Log: |
| 5 |
Replace the “latest” string with the correct version during the autotools_run_tool. |
| 6 |
|
| 7 |
Instead of doing that during the main evaluation, wait for it, so that |
| 8 |
it's done at the very last moment; this solves bug #270010 properly, |
| 9 |
without forcing an older automake version. |
| 10 |
|
| 11 |
It should also be possible to move the latest handling into the |
| 12 |
wrappers and use them if the new version is present, but that's |
| 13 |
another problem. |
| 14 |
|
| 15 |
Revision Changes Path |
| 16 |
1.86 eclass/autotools.eclass |
| 17 |
|
| 18 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.86&view=markup |
| 19 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.86&content-type=text/plain |
| 20 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.85&r2=1.86 |
| 21 |
|
| 22 |
Index: autotools.eclass |
| 23 |
=================================================================== |
| 24 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 25 |
retrieving revision 1.85 |
| 26 |
retrieving revision 1.86 |
| 27 |
diff -u -r1.85 -r1.86 |
| 28 |
--- autotools.eclass 4 May 2009 22:27:05 -0000 1.85 |
| 29 |
+++ autotools.eclass 18 May 2009 11:24:30 -0000 1.86 |
| 30 |
@@ -1,6 +1,6 @@ |
| 31 |
# Copyright 1999-2008 Gentoo Foundation |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.85 2009/05/04 22:27:05 vapier Exp $ |
| 34 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.86 2009/05/18 11:24:30 flameeyes Exp $ |
| 35 |
|
| 36 |
# @ECLASS: autotools.eclass |
| 37 |
# @MAINTAINER: |
| 38 |
@@ -29,10 +29,10 @@ |
| 39 |
if [[ -n ${WANT_AUTOMAKE} ]]; then |
| 40 |
case ${WANT_AUTOMAKE} in |
| 41 |
none) _automake_atom="" ;; # some packages don't require automake at all |
| 42 |
+ # if you change the “latest” version here, change also autotools_run_tool |
| 43 |
latest) _automake_atom="=sys-devel/automake-1.10*" ;; |
| 44 |
*) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; |
| 45 |
esac |
| 46 |
- [[ ${WANT_AUTOMAKE} == "latest" ]] && WANT_AUTOMAKE="1.10" |
| 47 |
export WANT_AUTOMAKE |
| 48 |
fi |
| 49 |
|
| 50 |
@@ -40,10 +40,10 @@ |
| 51 |
case ${WANT_AUTOCONF} in |
| 52 |
none) _autoconf_atom="" ;; # some packages don't require autoconf at all |
| 53 |
2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;; |
| 54 |
+ # if you change the “latest” version here, change also autotools_run_tool |
| 55 |
latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;; |
| 56 |
*) _autoconf_atom="INCORRECT-WANT_AUTOCONF-SETTING-IN-EBUILD" ;; |
| 57 |
esac |
| 58 |
- [[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5" |
| 59 |
export WANT_AUTOCONF |
| 60 |
fi |
| 61 |
DEPEND="${_automake_atom} |
| 62 |
@@ -241,6 +241,11 @@ |
| 63 |
ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" |
| 64 |
fi |
| 65 |
|
| 66 |
+ # We do the “latest” → version switch here because it solves |
| 67 |
+ # possible order problems, see bug #270010 as an example. |
| 68 |
+ [[ ${WANT_AUTOMAKE} == "latest" ]] && export WANT_AUTOMAKE=1.10 |
| 69 |
+ [[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5 |
| 70 |
+ |
| 71 |
local STDERR_TARGET="${T}/$1.out" |
| 72 |
# most of the time, there will only be one run, but if there are |
| 73 |
# more, make sure we get unique log filenames |
Archives