fixup! python-utils-r1.eclass: Use wrapper scripts to fix cross-compi…

…ling
gentoo · Sep 13, 2018 · 6cedcf1 · 6cedcf1
1 parent da10c38
commit 6cedcf1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
@@ -1001,6 +1001,9 @@ python_wrapper_setup() {
 	[[ ${workdir} ]] || die "${FUNCNAME}: no workdir specified."
 	[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON specified."
 
+	local EPYTHON
+	python_export "${impl}" EPYTHON
+
 	if [[ ! -x ${workdir}/bin/python ]]; then
 		_python_check_dead_variables
 
@@ -1011,9 +1014,6 @@ python_wrapper_setup() {
 		rm -f "${workdir}"/bin/2to3 || die
 		rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die
 
-		local EPYTHON
-		python_export "${impl}" EPYTHON
-
 		local pyver pyother
 		if python_is_python3; then
 			pyver=3
@@ -1082,11 +1082,12 @@ python_wrapper_setup() {
 			nonsupp+=( "${EPYTHON}" )
 			[[ ${EPYTHON} == python* ]] && nonsupp+=( "${EPYTHON}-config" )
 		done
+		EPYTHON=${orig_EPYTHON}
 
 		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