summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-02-10 06:18:19 +0000
committerMike Frysinger <vapier@gentoo.org>2013-02-10 06:18:19 +0000
commit3fe725f34283a421febfd77199843bb5168f456f (patch)
tree56d983dada165d64b36997f5394fc3fa93380b95 /eclass/linux-info.eclass
parentReinstated patch to fix locale/utf8 in test, py3 specific, cited and tested i... (diff)
downloadgentoo-2-3fe725f34283a421febfd77199843bb5168f456f.tar.gz
gentoo-2-3fe725f34283a421febfd77199843bb5168f456f.tar.bz2
gentoo-2-3fe725f34283a421febfd77199843bb5168f456f.zip
use emake rather than make to extract variable values #373151 by Kevin Pyle
Diffstat (limited to 'eclass/linux-info.eclass')
-rw-r--r--eclass/linux-info.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 9bca8f98739d..6e332f00442e 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.97 2013/02/10 02:21:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.98 2013/02/10 06:18:19 vapier Exp $
# @ECLASS: linux-info.eclass
# @MAINTAINER:
@@ -183,8 +183,10 @@ getfilevar() {
basedname="$(dirname ${2})"
unset ARCH
+ # We use nonfatal because we want the caller to take care of things #373151
+ [[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; }
echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \
- make -C "${basedname}" M="${S}" ${BUILD_FIXES} -s -f - 2>/dev/null
+ nonfatal emake -C "${basedname}" M="${S}" ${BUILD_FIXES} -s -f - 2>/dev/null
ARCH=${myARCH}
fi