1 |
Using M="${S}" breaks in the pkg_setup phase where the S variable is |
2 |
not valid. Previous commit messages don't give any rationale why some |
3 |
phases would need the dir pointing to ${S}. Therefore, use ${T} in all |
4 |
phases unconditionally. |
5 |
|
6 |
Closes: https://bugs.gentoo.org/729178 |
7 |
Bug: https://bugs.gentoo.org/469210 |
8 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
9 |
--- |
10 |
eclass/linux-info.eclass | 9 +++------ |
11 |
1 file changed, 3 insertions(+), 6 deletions(-) |
12 |
|
13 |
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass |
14 |
index 405ef5571e1c..11a890889e4f 100644 |
15 |
--- a/eclass/linux-info.eclass |
16 |
+++ b/eclass/linux-info.eclass |
17 |
@@ -1,4 +1,4 @@ |
18 |
-# Copyright 1999-2018 Gentoo Foundation |
19 |
+# Copyright 1999-2020 Gentoo Authors |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
|
22 |
# @ECLASS: linux-info.eclass |
23 |
@@ -166,7 +166,7 @@ qeerror() { qout eerror "${@}" ; } |
24 |
# done by including the configfile, and printing the variable with Make. |
25 |
# It WILL break if your makefile has missing dependencies! |
26 |
getfilevar() { |
27 |
- local ERROR basefname basedname myARCH="${ARCH}" M="${S}" |
28 |
+ local ERROR basefname basedname myARCH="${ARCH}" |
29 |
ERROR=0 |
30 |
|
31 |
[ -z "${1}" ] && ERROR=1 |
32 |
@@ -184,11 +184,8 @@ getfilevar() { |
33 |
|
34 |
# We use nonfatal because we want the caller to take care of things #373151 |
35 |
[[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; } |
36 |
- case ${EBUILD_PHASE_FUNC} in |
37 |
- pkg_info|pkg_nofetch|pkg_pretend) M="${T}" ;; |
38 |
- esac |
39 |
echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \ |
40 |
- nonfatal emake -C "${basedname}" M="${M}" ${BUILD_FIXES} -s -f - 2>/dev/null |
41 |
+ nonfatal emake -C "${basedname}" M="${T}" ${BUILD_FIXES} -s -f - 2>/dev/null |
42 |
|
43 |
ARCH=${myARCH} |
44 |
fi |
45 |
-- |
46 |
2.27.0 |