From 7f291f5759959bc338ca0b52b169871f0dccf9a9 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 8 Sep 2018 09:06:34 +0200 Subject: python-utils-r1.eclass: Block also pythonX.Y in wrappers Improve the wrapper blocking logic to block specific Python versions as well rather than just 2/3. In other words, for eselected pythonX.Y both pythonZ (Z = X^1) and python*.* (!= X.Y) will be blocked. Hopefully this will catch more build systems that hardcode Python versions rather than respecting what we're giving them. This will work only for build systems respecting PATH. Build systems (and ebuilds) using /usr/bin path directly will still be able to use other Python versions. --- eclass/python-utils-r1.eclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'eclass') diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index e3cf82b4b58f..6bcbe2e5a09f 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1043,11 +1043,21 @@ 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 ${EPYTHON} (PYTHON_COMPAT)" >&2 + echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${orig_EPYTHON} (PYTHON_COMPAT)" >&2 exit 127 _EOF_ chmod +x "${workdir}"/bin/${x} || die -- cgit v1.2.3-65-gdbad