From 5c28d5f0689ebd185690ecfe13f8321bae198f30 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Fri, 26 Sep 2008 16:21:54 +0000 Subject: Add a || clause to the phase test as autotools functions may now be called from src_unpack or from src_prepare for EAPI-2. --- eclass/autotools.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index e8c100acbbc2..71593941a1a0 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.80 2008/07/31 20:45:41 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.81 2008/09/26 16:21:54 jmbsvicetto Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -76,12 +76,12 @@ AT_GNUCONF_UPDATE="no" # This function mimes the behavior of autoreconf, but uses the different # eauto* functions to run the tools. It doesn't accept parameters, but # the directory with include files can be specified with AT_M4DIR variable. -# +# # Should do a full autoreconf - normally what most people will be interested in. # Also should handle additional directories specified by AC_CONFIG_SUBDIRS. eautoreconf() { local pwd=$(pwd) x auxdir - + if [[ -z ${AT_NO_RECURSIVE} ]]; then # Take care of subdirs for x in $(autotools_get_subdirs); do @@ -236,7 +236,7 @@ eautomake() { # Internal function to run an autotools' tool autotools_run_tool() { - if [[ ${EBUILD_PHASE} != "unpack" ]]; then + if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" fi -- cgit v1.2.3-65-gdbad