Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 29 Jun 2021 06:05:09
Message-Id: 1624946697.c8406daedfa823e9b59b6749c423efee4e713c0c.mgorny@gentoo
1 commit: c8406daedfa823e9b59b6749c423efee4e713c0c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 20 09:37:44 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 06:04:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8406dae
7
8 distutils-r1.eclass: Use 'dosym -r' in EAPI 8
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/distutils-r1.eclass | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
16 index 3d50cd5a2f2..e2cafb425c3 100644
17 --- a/eclass/distutils-r1.eclass
18 +++ b/eclass/distutils-r1.eclass
19 @@ -775,8 +775,10 @@ _distutils-r1_wrap_scripts() {
20 local basename=${f##*/}
21
22 debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}"
23 - _python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
24 - "${D%/}${bindir}/${basename}" || die
25 + local dosym=dosym
26 + [[ ${EAPI} == [67] ]] && dosym=dosym8
27 + "${dosym}" -r /usr/lib/python-exec/python-exec2 \
28 + "${bindir#${EPREFIX}}/${basename}"
29 done
30
31 for f in "${non_python_files[@]}"; do