summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-04-01 21:42:37 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-04-01 21:42:37 +0000
commit37790124c33f87e9c92107b540f69dbe43ea25c3 (patch)
tree716453a883d491dea10c119ec7a5c6b3d8d98842 /eclass
parentx11-drivers/xf86-video-intel: bump to 2.11.0, fix kernel config check (see bu... (diff)
downloadgentoo-2-37790124c33f87e9c92107b540f69dbe43ea25c3.tar.gz
gentoo-2-37790124c33f87e9c92107b540f69dbe43ea25c3.tar.bz2
gentoo-2-37790124c33f87e9c92107b540f69dbe43ea25c3.zip
Bug #312687: We actually need to consider the automake from the real root, not the ROOT destination for stage 1 builds.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/autotools.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index e8d381f7c7ce..8e99488c42af 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -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" ]] && \