1 |
vapier 07/09/17 23:15:51 |
2 |
|
3 |
Modified: autotools.eclass |
4 |
Log: |
5 |
add support for WANT_AUTOCONF=none #192863 and catch invalid WANT_AUTOCONF settings |
6 |
|
7 |
Revision Changes Path |
8 |
1.67 eclass/autotools.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.67&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.67&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.66&r2=1.67 |
13 |
|
14 |
Index: autotools.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
17 |
retrieving revision 1.66 |
18 |
retrieving revision 1.67 |
19 |
diff -u -r1.66 -r1.67 |
20 |
--- autotools.eclass 30 May 2007 15:45:01 -0000 1.66 |
21 |
+++ autotools.eclass 17 Sep 2007 23:15:51 -0000 1.67 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2007 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.66 2007/05/30 15:45:01 cardoe Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.67 2007/09/17 23:15:51 vapier Exp $ |
27 |
# |
28 |
# Maintainer: base-system@g.o |
29 |
# |
30 |
@@ -18,10 +18,9 @@ |
31 |
_autoconf_atom="sys-devel/autoconf" |
32 |
if [[ -n ${WANT_AUTOMAKE} ]]; then |
33 |
case ${WANT_AUTOMAKE} in |
34 |
- # workaround while we have different versions of automake in arch and ~arch |
35 |
- none) _automake_atom="" ;; # some packages don't require automake at all |
36 |
+ none) _automake_atom="" ;; # some packages don't require automake at all |
37 |
latest) _automake_atom="=sys-devel/automake-1.10*" ;; |
38 |
- *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; |
39 |
+ *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; |
40 |
esac |
41 |
[[ ${WANT_AUTOMAKE} == "latest" ]] && WANT_AUTOMAKE="1.10" |
42 |
export WANT_AUTOMAKE |
43 |
@@ -29,8 +28,10 @@ |
44 |
|
45 |
if [[ -n ${WANT_AUTOCONF} ]] ; then |
46 |
case ${WANT_AUTOCONF} in |
47 |
- 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;; |
48 |
- latest | 2.5) _autoconf_atom=">=sys-devel/autoconf-2.59" ;; |
49 |
+ none) _autoconf_atom="" ;; # some packages don't require autoconf at all |
50 |
+ 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;; |
51 |
+ latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;; |
52 |
+ *) _autoconf_atom=">=sys-devel/autoconf-FAIL" ;; |
53 |
esac |
54 |
[[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5" |
55 |
export WANT_AUTOCONF |
56 |
|
57 |
|
58 |
|
59 |
-- |
60 |
gentoo-commits@g.o mailing list |