https://github.com/python/cpython/commit/b5e142ba7c2063efe9bb8065c3b0bad33e2a9afa
commit: b5e142ba7c2063efe9bb8065c3b0bad33e2a9afa
branch: main
author: Jonathan Protzenko <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-08-06T23:31:39Z
summary:
gh-122571: Remove duplicate definition of PY_BUILTIN_HASHLIB_HASHES in
configure.ac (#122572)
The redefinition in confdefs.h can cause issues with the
AX_CHECK_COMPILE_FLAG macro.
files:
M configure
M configure.ac
diff --git a/configure b/configure
index 39ab48fa4e2526..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 /**/" >>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,6 +28721,7 @@ 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
diff --git a/configure.ac b/configure.ac
index 62ed812991fc4e..fb40607abfa73c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7403,8 +7403,6 @@ 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_MSG_CHECKING([for --with-builtin-hashlib-hashes])
AC_ARG_WITH(
[builtin-hashlib-hashes],
@@ -7421,7 +7419,8 @@ AC_ARG_WITH(
AC_MSG_RESULT([$with_builtin_hashlib_hashes])
AC_DEFINE_UNQUOTED([PY_BUILTIN_HASHLIB_HASHES],
- ["$with_builtin_hashlib_hashes"])
+ ["$with_builtin_hashlib_hashes"],
+ [enabled builtin hash modules])
as_save_IFS=$IFS
IFS=,
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
