1 |
flameeyes 10/04/01 10:12:36 |
2 |
|
3 |
Modified: autotools.eclass |
4 |
Log: |
5 |
Try to unbreak revision 1.95, at least guessing what Robin tried to do. |
6 |
|
7 |
Revision Changes Path |
8 |
1.96 eclass/autotools.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.96&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.96&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.95&r2=1.96 |
13 |
|
14 |
Index: autotools.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
17 |
retrieving revision 1.95 |
18 |
retrieving revision 1.96 |
19 |
diff -u -r1.95 -r1.96 |
20 |
--- autotools.eclass 31 Mar 2010 02:11:55 -0000 1.95 |
21 |
+++ autotools.eclass 1 Apr 2010 10:12:36 -0000 1.96 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2010 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.95 2010/03/31 02:11:55 robbat2 Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.96 2010/04/01 10:12:36 flameeyes Exp $ |
27 |
|
28 |
# @ECLASS: autotools.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -27,7 +27,7 @@ |
31 |
# @ECLASS-VARIABLE: _LATEST_AUTOMAKE |
32 |
# @DESCRIPTION: |
33 |
# CONSTANT! |
34 |
-# The latest major version/slot of automake available on each arch. |
35 |
+# The latest major version/slot of automake available on each arch. |
36 |
# If a newer version is stable on any arch, and is NOT reflected in this list, |
37 |
# then circular dependencies may arise during emerge @system bootstraps. |
38 |
# Do NOT change this variable in your ebuilds! |
39 |
@@ -40,12 +40,13 @@ |
40 |
none) _automake_atom="" ;; # some packages don't require automake at all |
41 |
# if you change the “latest” version here, change also autotools_run_tool |
42 |
# this MUST reflect the latest stable major version for each arch! |
43 |
- latest) |
44 |
- t="" ; for v in ${_LATEST_AUTOMAKE} ; do |
45 |
+ latest) |
46 |
+ t="" |
47 |
+ for v in ${_LATEST_AUTOMAKE} ; do |
48 |
t="${t} =sys-devel/automake-${v}*" |
49 |
done |
50 |
+ _automake_atom="|| ( ${t} )" |
51 |
unset t v |
52 |
- _automake_atom="|| ( ${_automake_atom} )" |
53 |
;; |
54 |
*) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; |
55 |
esac |
56 |
@@ -277,12 +278,14 @@ |
57 |
|
58 |
# We do the “latest” → version switch here because it solves |
59 |
# possible order problems, see bug #270010 as an example. |
60 |
- for pv in ${_LATEST_AUTOMAKE} ; do |
61 |
- has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv" |
62 |
- done |
63 |
- unset pv |
64 |
- [[ ${WANT_AUTOMAKE} == "latest" ]] && \ |
65 |
- die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}" |
66 |
+ if [[ ${WANT_AUTOMAKE} == "latest" ]]; then |
67 |
+ for pv in ${_LATEST_AUTOMAKE} ; do |
68 |
+ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv" |
69 |
+ done |
70 |
+ unset pv |
71 |
+ [[ ${WANT_AUTOMAKE} == "latest" ]] && \ |
72 |
+ die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}" |
73 |
+ fi |
74 |
[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5 |
75 |
|
76 |
local STDERR_TARGET="${T}/$1.out" |