Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-122571: Remove duplicate definition of PY_BUILTIN_HASHLIB_HASHES in configure.ac (GH-122572) (#122763) 

gh-122571: Remove duplicate definition of PY_BUILTIN_HASHLIB_HASHES in configure.ac (GH-122572)

The redefinition in confdefs.h can cause issues with the
AX_CHECK_COMPILE_FLAG macro.
(cherry picked from commit b5e142ba7c)

Co-authored-by: Jonathan Protzenko <protz@microsoft.com>
This commit is contained in:
Miss Islington (bot) 2024-09-02 12:52:21 +02:00 committed by GitHub
parent 29733b084d
commit 8a4f708220
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure generated vendored
View File

@ -28430,9 +28430,6 @@ fi
# builtin hash modules # builtin hash modules
default_hashlib_hashes="md5,sha1,sha2,sha3,blake2" 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\n" "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5
printf %s "checking for --with-builtin-hashlib-hashes... " >&6; } printf %s "checking for --with-builtin-hashlib-hashes... " >&6; }
@ -28457,6 +28454,7 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_builtin_hashlib_hashes" >&5 { 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" "$with_builtin_hashlib_hashes" >&6; }
printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$with_builtin_hashlib_hashes\"" >>confdefs.h printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$with_builtin_hashlib_hashes\"" >>confdefs.h

5
configure.ac
View File

@ -7318,8 +7318,6 @@ AC_DEFINE([PY_SSL_DEFAULT_CIPHERS], [1])
# builtin hash modules # builtin hash modules
default_hashlib_hashes="md5,sha1,sha2,sha3,blake2" 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_MSG_CHECKING([for --with-builtin-hashlib-hashes])
AC_ARG_WITH( AC_ARG_WITH(
[builtin-hashlib-hashes], [builtin-hashlib-hashes],
@ -7336,7 +7334,8 @@ AC_ARG_WITH(
AC_MSG_RESULT([$with_builtin_hashlib_hashes]) AC_MSG_RESULT([$with_builtin_hashlib_hashes])
AC_DEFINE_UNQUOTED([PY_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 as_save_IFS=$IFS
IFS=, IFS=,