diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-02-10 06:18:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-02-10 06:18:19 +0000 |
| commit | 904607d90122bf354cdede06b14f5b005f523b27 (patch) | |
| tree | 46f4cb6d605d3e68fad94037442b7cb47e3137a8 /eclass | |
| parent | Reinstated patch to fix locale/utf8 in test, py3 specific, cited and tested i... (diff) | |
| download | historical-904607d90122bf354cdede06b14f5b005f523b27.tar.gz historical-904607d90122bf354cdede06b14f5b005f523b27.tar.bz2 historical-904607d90122bf354cdede06b14f5b005f523b27.zip | |
use emake rather than make to extract variable values #373151 by Kevin Pyle
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/linux-info.eclass | 6 |
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 |