| 1 |
jmbsvicetto 08/09/26 16:21:55 |
| 2 |
|
| 3 |
Modified: autotools.eclass |
| 4 |
Log: |
| 5 |
Add a || clause to the phase test as autotools functions may now be called from |
| 6 |
src_unpack or from src_prepare for EAPI-2. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.81 eclass/autotools.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.81&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.81&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.80&r2=1.81 |
| 14 |
|
| 15 |
Index: autotools.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 18 |
retrieving revision 1.80 |
| 19 |
retrieving revision 1.81 |
| 20 |
diff -u -r1.80 -r1.81 |
| 21 |
--- autotools.eclass 31 Jul 2008 20:45:41 -0000 1.80 |
| 22 |
+++ autotools.eclass 26 Sep 2008 16:21:54 -0000 1.81 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.80 2008/07/31 20:45:41 darkside Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.81 2008/09/26 16:21:54 jmbsvicetto Exp $ |
| 28 |
|
| 29 |
# @ECLASS: autotools.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -76,12 +76,12 @@ |
| 32 |
# This function mimes the behavior of autoreconf, but uses the different |
| 33 |
# eauto* functions to run the tools. It doesn't accept parameters, but |
| 34 |
# the directory with include files can be specified with AT_M4DIR variable. |
| 35 |
-# |
| 36 |
+# |
| 37 |
# Should do a full autoreconf - normally what most people will be interested in. |
| 38 |
# Also should handle additional directories specified by AC_CONFIG_SUBDIRS. |
| 39 |
eautoreconf() { |
| 40 |
local pwd=$(pwd) x auxdir |
| 41 |
- |
| 42 |
+ |
| 43 |
if [[ -z ${AT_NO_RECURSIVE} ]]; then |
| 44 |
# Take care of subdirs |
| 45 |
for x in $(autotools_get_subdirs); do |
| 46 |
@@ -236,7 +236,7 @@ |
| 47 |
|
| 48 |
# Internal function to run an autotools' tool |
| 49 |
autotools_run_tool() { |
| 50 |
- if [[ ${EBUILD_PHASE} != "unpack" ]]; then |
| 51 |
+ if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then |
| 52 |
ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" |
| 53 |
fi |
Archives