diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2021-06-24 15:22:23 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2021-06-24 17:05:03 -0400 |
| commit | adb01ab507f01f938f77d5e1794d7acb42378ad6 (patch) | |
| tree | 5187d8399097168b869fa6d90ff74dfbbf6aaae8 /eclass | |
| parent | Revert "python-utils-r1.eclass: Remove _python_ln_rel" (diff) | |
| download | gentoo-adb01ab507f01f938f77d5e1794d7acb42378ad6.tar.gz gentoo-adb01ab507f01f938f77d5e1794d7acb42378ad6.tar.bz2 gentoo-adb01ab507f01f938f77d5e1794d7acb42378ad6.zip | |
Revert "distutils-r1.eclass: Use 'dosym -r' in EAPI 8"
This breaks installation of scripts when EPREFIX is non-empty.
_distutils-r1_wrap_scripts should create a symlink like this:
"${D}/_${EPYTHON}${EPREFIX}/usr/bin/myscript"
The "dosym" version of this code creates the following instead:
"${D}${EPREFIX}/_${EPYTHON}/usr/bin/myscript"
Reverts: 9f831e240a9804a996fc80015f64d5e102ced740
Closes: https://bugs.gentoo.org/798456
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index cc0416fb1d9e..a26130f7a194 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -776,10 +776,8 @@ _distutils-r1_wrap_scripts() { local basename=${f##*/} debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}" - local dosym=dosym - [[ ${EAPI} == [67] ]] && dosym=dosym8 - "${dosym}" -r "${path#${D}}"/usr/lib/python-exec/python-exec2 \ - "${path#${D}}${bindir#${EPREFIX}}/${basename}" + _python_ln_rel "${path}${EPREFIX}"/usr/lib/python-exec/python-exec2 \ + "${path}${bindir}/${basename}" || die done for f in "${non_python_files[@]}"; do |