[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] [PATCH] linux-info.eclass: Pass M=${T} to the Linux Makefile unconditionally.
From:       Ulrich =?utf-8?Q?M=C3=BCller?= <ulm () gentoo ! org>
Date:       2020-06-24 16:15:54
Message-ID: u8sgccudh () gentoo ! org
[Download RAW message or body]


Using M="${S}" breaks in the pkg_setup phase where the S variable is
not valid. Previous commit messages don't give any rationale why some
phases would need the dir pointing to ${S}. Therefore, use ${T} in all
phases unconditionally.

Closes: https://bugs.gentoo.org/729178
Bug: https://bugs.gentoo.org/469210
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/linux-info.eclass | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 405ef5571e1c..11a890889e4f 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: linux-info.eclass
@@ -166,7 +166,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}" M="${S}"
+	local ERROR basefname basedname myARCH="${ARCH}"
 	ERROR=0
 
 	[ -z "${1}" ] && ERROR=1
@@ -184,11 +184,8 @@ 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="${M}" ${BUILD_FIXES} -s -f - 2>/dev/null
+			nonfatal emake -C "${basedname}" M="${T}" ${BUILD_FIXES} -s -f - 2>/dev/null
 
 		ARCH=${myARCH}
 	fi
-- 
2.27.0

["signature.asc" (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]