python-utils-r1.eclass: Revert "Block also pythonX.Y in wrappers"
authorMichał Górny <mgorny@gentoo.org>
Tue, 18 Sep 2018 17:11:16 +0000 (19:11 +0200)
committerMichał Górny <mgorny@gentoo.org>
Tue, 18 Sep 2018 17:12:34 +0000 (19:12 +0200)
This turned out to be overzealous and broke calling external programs
that were using different Python version.

Reverts: 7f291f5759959bc338ca0b52b169871f0dccf9a9

eclass/python-utils-r1.eclass

index 6bcbe2e5a09f0bdaf5e7db32cde7cf7ef072afdf..e3cf82b4b58f698b1d84bb24baaa278748dea004 100644 (file)
@@ -1043,21 +1043,11 @@ python_wrapper_setup() {
                        nonsupp+=( 2to3 python-config "python${pyver}-config" )
                fi
 
-               # block all other interpreters as incompatible
-               local orig_EPYTHON=${EPYTHON}
                local x
-               for x in "${_PYTHON_ALL_IMPLS[@]}"; do
-                       python_export "${x}" EPYTHON
-                       [[ ${EPYTHON} == ${orig_EPYTHON} ]] && continue
-
-                       nonsupp+=( "${EPYTHON}" )
-                       [[ ${EPYTHON} == python* ]] && nonsupp+=( "${EPYTHON}-config" )
-               done
-
                for x in "${nonsupp[@]}"; do
                        cat >"${workdir}"/bin/${x} <<-_EOF_ || die
                                #!/bin/sh
-                               echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${orig_EPYTHON} (PYTHON_COMPAT)" >&2
+                               echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${EPYTHON} (PYTHON_COMPAT)" >&2
                                exit 127
                        _EOF_
                        chmod +x "${workdir}"/bin/${x} || die