summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-09-18 19:11:16 +0200
committerMichał Górny <mgorny@gentoo.org>2018-09-18 19:12:34 +0200
commit0b6ceb56b07e645d7c0374dbe93ae0bec67d85f8 (patch)
treeab3d9a8207ae5bd3f2e7503b37920479686d355a /eclass/python-utils-r1.eclass
parentprofiles: Drop >=ICU-61 package.mask (diff)
downloadgentoo-0b6ceb56b07e645d7c0374dbe93ae0bec67d85f8.tar.gz
gentoo-0b6ceb56b07e645d7c0374dbe93ae0bec67d85f8.tar.bz2
gentoo-0b6ceb56b07e645d7c0374dbe93ae0bec67d85f8.zip
python-utils-r1.eclass: Revert "Block also pythonX.Y in wrappers"
This turned out to be overzealous and broke calling external programs that were using different Python version. Reverts: 7f291f5759959bc338ca0b52b169871f0dccf9a9
Diffstat (limited to 'eclass/python-utils-r1.eclass')
-rw-r--r--eclass/python-utils-r1.eclass12
1 files changed, 1 insertions, 11 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 6bcbe2e5a09..e3cf82b4b58 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -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