[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/01 21:42:38

  Modified:             autotools.eclass
  Log:
  Bug #312687: We actually need to consider the automake from the real root, not the ROOT destination for stage 1 builds.

Revision  Changes    Path
1.97                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.96&r2=1.97

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -p -w -b -B -u -u -r1.96 -r1.97
--- autotools.eclass	1 Apr 2010 10:12:36 -0000	1.96
+++ autotools.eclass	1 Apr 2010 21:42:37 -0000	1.97
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.96 2010/04/01 10:12:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.97 2010/04/01 21:42:37 robbat2 Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -280,7 +280,9 @@ autotools_run_tool() {
 	# possible order problems, see bug #270010 as an example.
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
 		for pv in ${_LATEST_AUTOMAKE} ; do
-			has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
+			# has_version respects ROOT, but in this case, we don't want it to,
+			# thus "ROOT=/" prefix:
+			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
 		done
 		unset pv
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \