Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH v2] python-utils-r1.eclass: Use 'dosym -r' in EAPI 8
Date: Sun, 20 Jun 2021 13:21:50
Message-Id: 20210620132141.788500-1-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 02/28] python-utils-r1.eclass: Use 'dosym -r' in EAPI 8 by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/python-utils-r1.eclass | 6 ++++--
4 1 file changed, 4 insertions(+), 2 deletions(-)
5
6 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
7 index bab4be0f521d..4de550aa6a63 100644
8 --- a/eclass/python-utils-r1.eclass
9 +++ b/eclass/python-utils-r1.eclass
10 @@ -34,6 +34,7 @@ fi
11
12 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
13
14 +[[ ${EAPI} == [67] ]] && inherit eapi8-dosym
15 inherit toolchain-funcs
16
17 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
18 @@ -712,8 +713,9 @@ python_newexe() {
19 )
20
21 # install the wrapper
22 - _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
23 - "${ED%/}/${wrapd}/${newfn}" || die
24 + local dosym=dosym
25 + [[ ${EAPI} == [67] ]] && dosym=dosym8
26 + "${dosym}" -r /usr/lib/python-exec/python-exec2 "${wrapd}/${newfn}"
27
28 # don't use this at home, just call python_doscript() instead
29 if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
30 --
31 2.32.0