python-utils-r1.eclass: python_wrapper_setup, do not query PYTHON_CONFIG

Use plain 'pythonX.Y-config' executable name in the python-config
wrapper instead of querying the complete PYTHON_CONFIG path from
python_export.

Constructing full PYTHON_CONFIG path requires querying ABIFLAGS which
requires the Python interpreter to be installed, which in turn
unnecessarily forces every ebuild using the eclass to carry a build-time
dependency on the Python interpreter.

All current versions of Python correctly install 'pythonX.Y-config'
symlink that points to the correct ABI-suffixed binary. It is therefore
unnecessary to use the full path.

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index a67e378d39974b6e9d5f11f6a4d3218b42a3aba5..49a605b9e15962482cd78dbe766aadd6bcc2cfaa 100644 (file)
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -943,7 +943,7 @@ python_wrapper_setup() {
                rm -f "${workdir}"/bin/2to3 || die
                rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die
 
-               local EPYTHON PYTHON PYTHON_CONFIG
+               local EPYTHON PYTHON
                python_export "${impl}" EPYTHON PYTHON
 
                local pyver pyother
@@ -970,11 +970,9 @@ python_wrapper_setup() {
 
                # CPython-specific
                if [[ ${EPYTHON} == python* ]]; then
-                       python_export "${impl}" PYTHON_CONFIG
-
                        cat > "${workdir}/bin/python-config" <<-_EOF_ || die
                                #!/bin/sh
-                               exec "${PYTHON_CONFIG}" "\${@}"
+                               exec "${PYTHON}-config" "\${@}"
                        _EOF_
                        cp "${workdir}/bin/python-config" \
                                "${workdir}/bin/python${pyver}-config" || die