--- linux-info.eclass.orig 2014-05-08 12:35:17.724335228 -0400 +++ linux-info.eclass 2014-05-08 12:35:34.194653584 -0400 @@ -164,7 +164,7 @@ # 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 @@ # 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