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 02/28] python-utils-r1.eclass: Use 'dosym -r' in EAPI 8
Date: Sun, 20 Jun 2021 09:56:52
Message-Id: 20210620095552.625633-3-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/28] python-r1 suite EAPI 8 support/cleanup by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/python-utils-r1.eclass | 11 +++++++++--
4 1 file changed, 9 insertions(+), 2 deletions(-)
5
6 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
7 index bab4be0f521d..e164b9c20eb9 100644
8 --- a/eclass/python-utils-r1.eclass
9 +++ b/eclass/python-utils-r1.eclass
10 @@ -544,6 +544,8 @@ python_get_scriptdir() {
11 _python_ln_rel() {
12 debug-print-function ${FUNCNAME} "${@}"
13
14 + [[ ${EAPI} == [67] ]] || die "${FUNCNAME} banned in EAPI ${EAPI}"
15 +
16 local target=${1}
17 local symname=${2}
18
19 @@ -712,8 +714,13 @@ python_newexe() {
20 )
21
22 # install the wrapper
23 - _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
24 - "${ED%/}/${wrapd}/${newfn}" || die
25 + if [[ ${EAPI} != [67] ]]; then
26 + dosym -r /usr/lib/python-exec/python-exec2 \
27 + "${wrapd}/${newfn}"
28 + else
29 + _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
30 + "${ED%/}/${wrapd}/${newfn}" || die
31 + fi
32
33 # don't use this at home, just call python_doscript() instead
34 if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
35 --
36 2.32.0

Replies