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 1/4] distutils-r1.eclass: Defer wrapping scripts until after root-merge
Date: Fri, 25 Jun 2021 19:51:33
Message-Id: 20210625195101.351937-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/4] distutils-r1.eclass: dosym -r, attempt two by "Michał Górny"
1 Defer wrapping installed Python scripts until the files are merged
2 from impl-specific directory into ${ED}. This should clear the way
3 into using 'dosym -r'.
4
5 Signed-off-by: Michał Górny <mgorny@g.o>
6 ---
7 eclass/distutils-r1.eclass | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
11 index a26130f7a194..e194731ba6bb 100644
12 --- a/eclass/distutils-r1.eclass
13 +++ b/eclass/distutils-r1.eclass
14 @@ -921,8 +921,8 @@ distutils-r1_python_install() {
15 fi
16
17 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
18 - _distutils-r1_wrap_scripts "${root}" "${scriptdir}"
19 multibuild_merge_root "${root}" "${D%/}"
20 + _distutils-r1_wrap_scripts "${D%/}" "${scriptdir}"
21 fi
22 }
23
24 --
25 2.32.0