From 7fbac6f624b9275c449a510bbc386343419f07e2 Mon Sep 17 00:00:00 2001
From: Seth Michael Larson <seth@python.org>
Date: Fri, 19 Jan 2024 15:49:24 -0600
Subject: [PATCH] Backport 'Tools/build/regen-configure.sh' script

---
 Makefile.pre.in                | 10 +---------
 Tools/build/regen-configure.sh | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100755 Tools/build/regen-configure.sh

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2a0b850aaa3f02..774c226fcc9ef9 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2404,17 +2404,9 @@ recheck:
 autoconf:
 	(cd $(srcdir); autoreconf -ivf -Werror)
 
-# See https://github.com/tiran/cpython_autoconf container
 .PHONY: regen-configure
 regen-configure:
-	@if command -v podman >/dev/null; then RUNTIME="podman"; else RUNTIME="docker"; fi; \
-	if ! command -v $$RUNTIME; then echo "$@ needs either Podman or Docker container runtime." >&2; exit 1; fi; \
-	if command -v selinuxenabled >/dev/null && selinuxenabled; then OPT=":Z"; fi; \
-	# Manifest corresponds with tag '269' \
-	CPYTHON_AUTOCONF_MANIFEST="sha256:f370fee95eefa3d57b00488bce4911635411fa83e2d293ced8cf8a3674ead939" \
-	CMD="$$RUNTIME run --rm --pull=missing -v $(abs_srcdir):/src$$OPT quay.io/tiran/cpython_autoconf@$$CPYTHON_AUTOCONF_MANIFEST"; \
-	echo $$CMD; \
-	$$CMD || exit $?
+	$(srcdir)/Tools/build/regen-configure.sh
 
 # Create a tags file for vi
 tags::
diff --git a/Tools/build/regen-configure.sh b/Tools/build/regen-configure.sh
new file mode 100755
index 00000000000000..b4d6b9c66d4a7a
--- /dev/null
+++ b/Tools/build/regen-configure.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -e -x
+
+# Manifest corresponds with tag '269'
+# See https://github.com/tiran/cpython_autoconf container
+CPYTHON_AUTOCONF_MANIFEST="sha256:f370fee95eefa3d57b00488bce4911635411fa83e2d293ced8cf8a3674ead939"
+
+abs_srcdir=$(cd "$(dirname "$0")/../.."; pwd)
+
+if podman --version &>/dev/null; then
+    RUNTIME="podman"
+elif docker --version &>/dev/null; then
+    RUNTIME="docker"
+else
+    echo "$@ needs either Podman or Docker container runtime." >&2
+    exit 1
+fi
+
+PATH_OPT=""
+if command -v selinuxenabled >/dev/null && selinuxenabled; then
+    PATH_OPT=":Z"
+fi
+
+"$RUNTIME" run --rm --pull=missing -v "$abs_srcdir:/src$PATH_OPT" "quay.io/tiran/cpython_autoconf@$CPYTHON_AUTOCONF_MANIFEST"