robbat2 14/06/28 07:54:27 Modified: linux-info.eclass Log: ChangeLog
Revision Changes Path 1.104 eclass/linux-info.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.104&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?rev=1.104&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-info.eclass?r1=1.103&r2=1.104 Index: linux-info.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v retrieving revision 1.103 retrieving revision 1.104 diff -p -w -b -B -u -u -r1.103 -r1.104 --- linux-info.eclass 21 Mar 2014 22:03:00 -0000 1.103 +++ linux-info.eclass 28 Jun 2014 07:54:27 -0000 1.104 @@ -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
