From d281da83358ac48f8ca04d3231150e2de5aa4c57 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Mon, 28 Oct 2024 22:47:44 +0100
Subject: [PATCH] fix: entrypoint for armv7l

---
 docker/build_scripts/build-cpython.sh | 6 +++++-
 docker/manylinux-entrypoint           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/build_scripts/build-cpython.sh b/docker/build_scripts/build-cpython.sh
index 4551e64f1..06be23044 100755
--- a/docker/build_scripts/build-cpython.sh
+++ b/docker/build_scripts/build-cpython.sh
@@ -50,7 +50,9 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] ; then
 	export TCLTK_LIBS="-ltk8.6 -ltcl8.6"
 fi
 
-if [ "${BASE_POLICY}_${AUDITWHEEL_ARCH}" == "musllinux_armv7l" ]; then
+if [ "${BASE_POLICY}_${AUDITWHEEL_ARCH}" == "manylinux_armv7l" ]; then
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --build=armv7l-unknown-linux-gnueabihf"
+elif [ "${BASE_POLICY}_${AUDITWHEEL_ARCH}" == "musllinux_armv7l" ]; then
 	CONFIGURE_ARGS="${CONFIGURE_ARGS} --build=arm-linux-musleabihf"
 fi
 
@@ -71,6 +73,8 @@ if [ "${OPENSSL_PREFIX}" != "" ]; then
 	esac
 fi
 
+unset _PYTHON_HOST_PLATFORM
+
 # configure with hardening options only for the interpreter & stdlib C extensions
 # do not change the default for user built extension (yet?)
 ./configure \
diff --git a/docker/manylinux-entrypoint b/docker/manylinux-entrypoint
index bbe06c0ac..e1289aca4 100755
--- a/docker/manylinux-entrypoint
+++ b/docker/manylinux-entrypoint
@@ -6,7 +6,7 @@ if [ "${AUDITWHEEL_ARCH}" == "i686" ] && [ "$(uname -m)" == "x86_64" ]; then
 	linux32 "$@"
 elif [ "${AUDITWHEEL_ARCH}" == "armv7l" ] && [ "$(uname -m)" != "armv7l" ]; then
 	if [ "$(linux32 uname -m)" == "armv8l" ]; then
-		export _PYTHON_HOST_PLATFORM="linux_armv7l"
+		export _PYTHON_HOST_PLATFORM="linux-armv7l"
 	fi
 	linux32 "$@"
 else