From af0d73b2fc0a49c8fa158b8dfac8ba6f7673cb6e Mon Sep 17 00:00:00 2001
From: Jonathan Protzenko <protz@microsoft.com>
Date: Thu, 18 Jul 2024 12:46:21 -0700
Subject: [PATCH 1/3] Every single AX_CHECK_COMPILE_FLAG returns false because
 PY_BUILTIN_HASHLIB_HASHES appears twice as a #define in confdefs.h -- try to
 fix this

---
 configure    | 4 +---
 configure.ac | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 39ab48fa4e2526..1b9c1e1d08f3d8 100755
--- a/configure
+++ b/configure
@@ -28698,7 +28698,7 @@ fi
 # builtin hash modules
 default_hashlib_hashes="md5,sha1,sha2,sha3,blake2"
 
-printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES /**/" >>confdefs.h
+printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$with_builtin_hashlib_hashes\"" >>confdefs.h
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5
 printf %s "checking for --with-builtin-hashlib-hashes... " >&6; }
@@ -28724,8 +28724,6 @@ fi
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_builtin_hashlib_hashes" >&5
 printf "%s\n" "$with_builtin_hashlib_hashes" >&6; }
-printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$with_builtin_hashlib_hashes\"" >>confdefs.h
-
 
 as_save_IFS=$IFS
 IFS=,
diff --git a/configure.ac b/configure.ac
index 62ed812991fc4e..776a27aa96a044 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7403,8 +7403,7 @@ AC_DEFINE([PY_SSL_DEFAULT_CIPHERS], [1])
 
 # builtin hash modules
 default_hashlib_hashes="md5,sha1,sha2,sha3,blake2"
-AC_DEFINE([PY_BUILTIN_HASHLIB_HASHES], [], [enabled builtin hash modules]
-)
+AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES], ["$with_builtin_hashlib_hashes"], [enabled builtin hash modules])
 AC_MSG_CHECKING([for --with-builtin-hashlib-hashes])
 AC_ARG_WITH(
   [builtin-hashlib-hashes],
@@ -7420,8 +7419,6 @@ AC_ARG_WITH(
 ], [with_builtin_hashlib_hashes=$default_hashlib_hashes])
 
 AC_MSG_RESULT([$with_builtin_hashlib_hashes])
-AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES],
-  ["$with_builtin_hashlib_hashes"])
 
 as_save_IFS=$IFS
 IFS=,

From f9089fd29ee39da14157abb5f06df74088609d71 Mon Sep 17 00:00:00 2001
From: Jonathan Protzenko <protz@microsoft.com>
Date: Mon, 5 Aug 2024 12:50:11 -0700
Subject: [PATCH 2/3] Fix configure.ac

---
 configure    | 6 +++---
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 1b9c1e1d08f3d8..329373560f8578 100755
--- a/configure
+++ b/configure
@@ -28697,9 +28697,6 @@ fi
 
 # builtin hash modules
 default_hashlib_hashes="md5,sha1,sha2,sha3,blake2"
-
-printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$with_builtin_hashlib_hashes\"" >>confdefs.h
-
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5
 printf %s "checking for --with-builtin-hashlib-hashes... " >&6; }
 
@@ -28725,6 +28722,9 @@ fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_builtin_hashlib_hashes" >&5
 printf "%s\n" "$with_builtin_hashlib_hashes" >&6; }
 
+printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$with_builtin_hashlib_hashes\"" >>confdefs.h
+
+
 as_save_IFS=$IFS
 IFS=,
 for builtin_hash in $with_builtin_hashlib_hashes; do
diff --git a/configure.ac b/configure.ac
index 776a27aa96a044..2a54e4dd01258f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7403,7 +7403,6 @@ AC_DEFINE([PY_SSL_DEFAULT_CIPHERS], [1])
 
 # builtin hash modules
 default_hashlib_hashes="md5,sha1,sha2,sha3,blake2"
-AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES], ["$with_builtin_hashlib_hashes"], [enabled builtin hash modules])
 AC_MSG_CHECKING([for --with-builtin-hashlib-hashes])
 AC_ARG_WITH(
   [builtin-hashlib-hashes],
@@ -7419,6 +7418,7 @@ AC_ARG_WITH(
 ], [with_builtin_hashlib_hashes=$default_hashlib_hashes])
 
 AC_MSG_RESULT([$with_builtin_hashlib_hashes])
+AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES], ["$with_builtin_hashlib_hashes"], [enabled builtin hash modules])
 
 as_save_IFS=$IFS
 IFS=,

From b5b9282a42dd9ece9cf7934cf2f30d9744088b80 Mon Sep 17 00:00:00 2001
From: "Erlend E. Aasland" <erlend@python.org>
Date: Wed, 7 Aug 2024 01:04:25 +0200
Subject: [PATCH 3/3] Style nit

---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2a54e4dd01258f..fb40607abfa73c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7418,7 +7418,9 @@ AC_ARG_WITH(
 ], [with_builtin_hashlib_hashes=$default_hashlib_hashes])
 
 AC_MSG_RESULT([$with_builtin_hashlib_hashes])
-AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES], ["$with_builtin_hashlib_hashes"], [enabled builtin hash modules])
+AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES],
+                   ["$with_builtin_hashlib_hashes"],
+                   [enabled builtin hash modules])
 
 as_save_IFS=$IFS
 IFS=,