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