diff options
| author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-01-18 17:24:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 17:24:26 +0100 |
| commit | 88578e77a00a67efc427087c908f2fc2ed989e86 (patch) | |
| tree | c4f6daf7857ddcefa1a67bc88e034b26c5b73c3c /lang/python/python3/patches | |
| parent | de41b63ca45be91273e0ea97213b2a6a29ba2a9a (diff) | |
| parent | 5b2c8bccf3deff782a7a21b98cd96044747f574f (diff) | |
Merge pull request #17624 from jefferyto/python-3.10.2
python3: Update to 3.10.2, refresh patches
Diffstat (limited to 'lang/python/python3/patches')
3 files changed, 7 insertions, 7 deletions
diff --git a/lang/python/python3/patches/014-remove-platform-so-suffix.patch b/lang/python/python3/patches/014-remove-platform-so-suffix.patch index f56711115..8b2b74a8e 100644 --- a/lang/python/python3/patches/014-remove-platform-so-suffix.patch +++ b/lang/python/python3/patches/014-remove-platform-so-suffix.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -15638,7 +15638,7 @@ $as_echo_n "checking ABIFLAGS... " >&6; +@@ -15649,7 +15649,7 @@ $as_echo_n "checking ABIFLAGS... " >&6; $as_echo "$ABIFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5 $as_echo_n "checking SOABI... " >&6; } @@ -11,7 +11,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -4820,7 +4820,7 @@ AC_SUBST(SOABI) +@@ -4825,7 +4825,7 @@ AC_SUBST(SOABI) AC_MSG_CHECKING(ABIFLAGS) AC_MSG_RESULT($ABIFLAGS) AC_MSG_CHECKING(SOABI) diff --git a/lang/python/python3/patches/016-adjust-config-paths.patch b/lang/python/python3/patches/016-adjust-config-paths.patch index c16229e51..2c9699844 100644 --- a/lang/python/python3/patches/016-adjust-config-paths.patch +++ b/lang/python/python3/patches/016-adjust-config-paths.patch @@ -39,7 +39,7 @@ fi elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 -@@ -15708,7 +15708,7 @@ fi +@@ -15719,7 +15719,7 @@ fi @@ -59,7 +59,7 @@ fi elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) -@@ -4878,7 +4878,7 @@ fi], +@@ -4883,7 +4883,7 @@ fi], dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) diff --git a/lang/python/python3/patches/026-openssl-feature-flags.patch b/lang/python/python3/patches/026-openssl-feature-flags.patch index 398012ae4..9272f36a4 100644 --- a/lang/python/python3/patches/026-openssl-feature-flags.patch +++ b/lang/python/python3/patches/026-openssl-feature-flags.patch @@ -1,6 +1,6 @@ --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c -@@ -43,7 +43,9 @@ +@@ -48,7 +48,9 @@ #define PY_OPENSSL_HAS_SCRYPT 1 #define PY_OPENSSL_HAS_SHA3 1 #define PY_OPENSSL_HAS_SHAKE 1 @@ -8,5 +8,5 @@ #define PY_OPENSSL_HAS_BLAKE2 1 +#endif - static PyModuleDef _hashlibmodule; - + #if OPENSSL_VERSION_NUMBER >= 0x30000000L + #define PY_EVP_MD EVP_MD |
