From 75e4976dde1dc1419f9cf3ff722714871c039b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Mon, 23 Mar 2020 17:24:34 +0700
Subject: [PATCH] python{,3}{,-tkinter}: keep XBPS_ARCH variable

From commit cf6e6f14d3, (wrappers/uname: report correct machine type
on ethereal, 2020-02-10), uname wrapper has been updated to report
correct machine type in ethereal mode by replace its original machine
type by value reported by $XBPS_ARCH.

This effectively breaks python{,3}{,-tkinter}'s cross compile because
we reset all environment variable to configure for the host build.

Keep those environment variable.
---
 srcpkgs/python-tkinter/template  | 4 ++--
 srcpkgs/python/template          | 4 ++--
 srcpkgs/python3-tkinter/template | 4 ++--
 srcpkgs/python3/template         | 9 +++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 6614fca72bd..d07d24c7756 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -35,8 +35,8 @@ do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		mkdir -p host-build
 		cd host-build
-		env -i PATH=$PATH ../configure
-		env -i PATH=$PATH make ${makejobs} python
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
 		mkdir -p ../hostpython
 		mv python ../hostpython
 		cd ..
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 71830f531a0..a9702c5ded0 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -40,8 +40,8 @@ do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		mkdir -p host-build
 		cd host-build
-		env -i PATH=$PATH ../configure
-		env -i PATH=$PATH make ${makejobs} python
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
 		mkdir -p ../hostpython
 		mv python ../hostpython
 		cd ..
diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index bd44ed68023..f2faf76ad5b 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -35,8 +35,8 @@ do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		mkdir -p host-build
 		cd host-build
-		env -i PATH=$PATH CFLAGS=-Os ../configure
-		env -i PATH=$PATH make ${makejobs} python
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH CFLAGS=-Os ../configure
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
 		mkdir -p ../hostpython
 		mv python ../hostpython
 		cd ..
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 6f712d3e074..899e99be53c 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -28,17 +28,18 @@ alternatives="
 
 pre_configure() {
 	# Ensure that internal copies of expat and libffi are not used
-	rm -r Modules/expat
-	rm -r Modules/_ctypes/{darwin,libffi}*
+	rm -rf Modules/expat
+	rm -rf Modules/_ctypes/{darwin,libffi}*
 }
+
 do_configure() {
 	local _args
 	unset GCC CC CXX CPP LD AR AS RANLIB
 	if [ "$CROSS_BUILD" ]; then
 		mkdir -p host-build
 		cd host-build
-		env -i PATH=$PATH CFLAGS=-Os ../configure
-		env -i PATH=$PATH make ${makejobs} python
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH CFLAGS=-Os ../configure
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
 		mkdir -p ../hostpython
 		mv python ../hostpython
 		cd ..