diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-06-28 07:54:27 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-06-28 07:54:27 +0000 |
| commit | 53a1a581e61f9b9e53795ba4c149d3904d87c4b7 (patch) | |
| tree | dec4b49a2882e1001aa74aba0750319ed37d3067 /eclass | |
| parent | Drop old revisions (diff) | |
| download | gentoo-2-53a1a581e61f9b9e53795ba4c149d3904d87c4b7.tar.gz gentoo-2-53a1a581e61f9b9e53795ba4c149d3904d87c4b7.tar.bz2 gentoo-2-53a1a581e61f9b9e53795ba4c149d3904d87c4b7.zip | |
ChangeLog
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/linux-info.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index f33c1c190629..f6e9fc59792c 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.103 2014/03/21 22:03:00 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.104 2014/06/28 07:54:27 robbat2 Exp $ # @ECLASS: linux-info.eclass # @MAINTAINER: @@ -164,7 +164,7 @@ qeerror() { qout eerror "${@}" ; } # done by including the configfile, and printing the variable with Make. # It WILL break if your makefile has missing dependencies! getfilevar() { - local ERROR basefname basedname myARCH="${ARCH}" + local ERROR basefname basedname myARCH="${ARCH}" M="${S}" ERROR=0 [ -z "${1}" ] && ERROR=1 @@ -182,8 +182,11 @@ getfilevar() { # We use nonfatal because we want the caller to take care of things #373151 [[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; } + case ${EBUILD_PHASE_FUNC} in + pkg_info|pkg_nofetch|pkg_pretend) M="${T}" ;; + esac echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \ - nonfatal emake -C "${basedname}" M="${S}" ${BUILD_FIXES} -s -f - 2>/dev/null + nonfatal emake -C "${basedname}" M="${M}" ${BUILD_FIXES} -s -f - 2>/dev/null ARCH=${myARCH} fi |