[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] [PATCH 1/4] distutils-r1.eclass: Defer wrapping scripts until after root-merge
From:       Michał Górny <mgorny () gentoo ! org>
Date:       2021-06-25 19:50:58
Message-ID: 20210625195101.351937-2-mgorny () gentoo ! org
[Download RAW message or body]

Defer wrapping installed Python scripts until the files are merged
from impl-specific directory into ${ED}.  This should clear the way
into using 'dosym -r'.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/distutils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index a26130f7a194..e194731ba6bb 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -921,8 +921,8 @@ distutils-r1_python_install() {
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"
 		multibuild_merge_root "${root}" "${D%/}"
+		_distutils-r1_wrap_scripts "${D%/}" "${scriptdir}"
 	fi
 }
 
-- 
2.32.0


[prev in list] [next in list] [prev in thread] [next in thread]