We assumed Python to be located at /usr/$(get_libdir) in recent
changes to this eclass but this has changed from Python 3.7. We now
follow upstream, installing most files to /usr/lib, with only certain
files, such as the pkg-config files, going into /usr/$(get_libdir).
Signed-off-by: James Le Cuirot <ch...@gentoo.org>
---
eclass/python-utils-r1.eclass | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 17de9ca9c44f..5e54cc618212 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1063,7 +1063,14 @@ python_wrapper_setup() {
# CPython-specific
if [[ ${EPYTHON} == python* ]]; then
- local pysysrootlib=${pysysroot}/usr/$(get_libdir)
+ local pysysrootlib=${pysysroot}/usr/
+
+ case "${EPYTHON}" in
+ python2.*|python3.[0-6])
+ pysysrootlib+=$(get_libdir) ;;
+ *)
+ pysysrootlib+=lib ;;
+ esac
cat > "${workdir}/bin/python-config" <<-_EOF_ || die
#!/bin/sh
@@ -1093,7 +1100,7 @@ python_wrapper_setup() {
ln -s "${EPYTHON/python/2to3-}" "${workdir}"/bin/2to3
|| die
# Python 2.7+.
- ln -s "${pysysrootlib}"/pkgconfig/${EPYTHON/n/n-}.pc \
+ ln -s
"${pysysroot}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \
"${workdir}"/pkgconfig/python.pc || die
ln -s python.pc
"${workdir}"/pkgconfig/python${pyver}.pc || die
else
--
2.19.2
