Skip to content

Commit d1a0c36

Browse files
authored
python: Update to 3.12.8 (#22886)
See msys2-contrib/cpython-mingw#184
1 parent 37d6550 commit d1a0c36

File tree

124 files changed

+715
-607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+715
-607
lines changed

mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4a8d395dc3ac5f910ab0e8e7adb19c03040a36bb Mon Sep 17 00:00:00 2001
1+
From d46c08ffb5e744333eed065aadb0fc4b4c2ee0e7 Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <[email protected]>
33
Date: Thu, 17 Jun 2021 18:51:10 +0530
44
Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable
@@ -13,7 +13,7 @@ Co-authored-by: lovetox <[email protected]>
1313
1 file changed, 20 insertions(+)
1414

1515
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
16-
index 122d441..8122a7a 100644
16+
index 517b13a..d11e124 100644
1717
--- a/Lib/sysconfig.py
1818
+++ b/Lib/sysconfig.py
1919
@@ -2,6 +2,7 @@
@@ -24,7 +24,7 @@ index 122d441..8122a7a 100644
2424
import threading
2525
from os.path import realpath
2626

27-
@@ -519,11 +520,30 @@ def _generate_posix_vars():
27+
@@ -517,11 +518,30 @@ def _generate_posix_vars():
2828
os.makedirs(pybuilddir, exist_ok=True)
2929
destfile = os.path.join(pybuilddir, name + '.py')
3030

mingw-w64-python/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3c81b7746cc69a2c38e640606ec8ec128792e54c Mon Sep 17 00:00:00 2001
1+
From 2cf9610fdb4569087c96817460d4ca01780c1e1c Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:12 +0530
@@ -81,10 +81,10 @@ index dfc2a8e..dc92a23 100644
8181
# include <fcntl.h> /* O_CREAT and O_EXCL */
8282
# if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
8383
diff --git a/configure.ac b/configure.ac
84-
index d0d5405..7c1577d 100644
84+
index 9270b5f..7e3846c 100644
8585
--- a/configure.ac
8686
+++ b/configure.ac
87-
@@ -2697,6 +2697,53 @@ then
87+
@@ -2700,6 +2700,53 @@ then
8888
BASECFLAGS="$BASECFLAGS $ac_arch_flags"
8989
fi
9090

@@ -138,7 +138,7 @@ index d0d5405..7c1577d 100644
138138
# On some compilers, pthreads are available without further options
139139
# (e.g. MacOS X). On some of these systems, the compiler will not
140140
# complain if unaccepted options are passed (e.g. gcc on Mac OS X).
141-
@@ -2808,6 +2855,8 @@ int main(void){
141+
@@ -2811,6 +2858,8 @@ int main(void){
142142
CC="$ac_save_cc"])
143143
fi
144144

@@ -147,7 +147,7 @@ index d0d5405..7c1577d 100644
147147
# If we have set a CC compiler flag for thread support then
148148
# check if it works for CXX, too.
149149
if test ! -z "$CXX"
150-
@@ -2827,6 +2876,10 @@ elif test "$ac_cv_pthread" = "yes"
150+
@@ -2830,6 +2879,10 @@ elif test "$ac_cv_pthread" = "yes"
151151
then
152152
CXX="$CXX -pthread"
153153
ac_cv_cxx_thread=yes
@@ -158,7 +158,7 @@ index d0d5405..7c1577d 100644
158158
else
159159
ac_cv_cxx_thread=no
160160
fi
161-
@@ -2868,8 +2921,8 @@ AC_CHECK_HEADERS([ \
161+
@@ -2871,8 +2924,8 @@ AC_CHECK_HEADERS([ \
162162
alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
163163
ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/fs.h linux/limits.h linux/memfd.h \
164164
linux/random.h linux/soundcard.h \
@@ -169,7 +169,7 @@ index d0d5405..7c1577d 100644
169169
sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
170170
sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/poll.h \
171171
sys/random.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/soundcard.h sys/stat.h \
172-
@@ -2880,6 +2933,14 @@ AC_CHECK_HEADERS([ \
172+
@@ -2883,6 +2936,14 @@ AC_CHECK_HEADERS([ \
173173
AC_HEADER_DIRENT
174174
AC_HEADER_MAJOR
175175

@@ -184,7 +184,7 @@ index d0d5405..7c1577d 100644
184184
# bluetooth/bluetooth.h has been known to not compile with -std=c99.
185185
# http://permalink.gmane.org/gmane.linux.bluez.kernel/22294
186186
SAVE_CFLAGS=$CFLAGS
187-
@@ -3092,6 +3153,10 @@ elif test "$ac_cv_pthread" = "yes"
187+
@@ -3095,6 +3156,10 @@ elif test "$ac_cv_pthread" = "yes"
188188
then CC="$CC -pthread"
189189
fi
190190

@@ -195,7 +195,7 @@ index d0d5405..7c1577d 100644
195195
AC_CACHE_CHECK([for pthread_t], [ac_cv_have_pthread_t], [
196196
AC_COMPILE_IFELSE([
197197
AC_LANG_PROGRAM([[@%:@include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])
198-
@@ -3123,7 +3188,7 @@ AS_VAR_IF([ac_cv_pthread_key_t_is_arithmetic_type], [yes], [
198+
@@ -3126,7 +3191,7 @@ AS_VAR_IF([ac_cv_pthread_key_t_is_arithmetic_type], [yes], [
199199
AC_DEFINE([PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT], [1],
200200
[Define if pthread_key_t is compatible with int.])
201201
])
@@ -204,7 +204,7 @@ index d0d5405..7c1577d 100644
204204
CC="$ac_save_cc"
205205

206206
AC_MSG_CHECKING([for --enable-framework])
207-
@@ -3655,10 +3720,15 @@ AS_VAR_IF([have_uuid], [missing], [
207+
@@ -3658,10 +3723,15 @@ AS_VAR_IF([have_uuid], [missing], [
208208

209209
AS_VAR_IF([have_uuid], [missing], [have_uuid=no])
210210

@@ -220,7 +220,7 @@ index d0d5405..7c1577d 100644
220220

221221
# check if we need libintl for locale functions
222222
AC_CHECK_LIB([intl], [textdomain],
223-
@@ -4378,6 +4448,11 @@ then
223+
@@ -4381,6 +4451,11 @@ then
224224
CXX="$CXX -pthread"
225225
fi
226226
posix_threads=yes
@@ -232,7 +232,7 @@ index d0d5405..7c1577d 100644
232232
else
233233
if test ! -z "$withval" -a -d "$withval"
234234
then LDFLAGS="$LDFLAGS -L$withval"
235-
@@ -4894,6 +4969,15 @@ else
235+
@@ -4897,6 +4972,15 @@ else
236236
fi
237237

238238
# checks for library functions
@@ -248,7 +248,7 @@ index d0d5405..7c1577d 100644
248248
AC_CHECK_FUNCS([ \
249249
accept4 alarm bind_textdomain_codeset chmod chown clock close_range confstr \
250250
copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \
251-
@@ -5792,6 +5876,10 @@ dnl actually works. For FreeBSD versions <= 7.2,
251+
@@ -5793,6 +5877,10 @@ dnl actually works. For FreeBSD versions <= 7.2,
252252
dnl the kernel module that provides POSIX semaphores
253253
dnl isn't loaded by default, so an attempt to call
254254
dnl sem_open results in a 'Signal 12' error.
@@ -259,7 +259,7 @@ index d0d5405..7c1577d 100644
259259
AC_CACHE_CHECK([whether POSIX semaphores are enabled], [ac_cv_posix_semaphores_enabled],
260260
AC_RUN_IFELSE([
261261
AC_LANG_SOURCE([
262-
@@ -5825,6 +5913,14 @@ AS_VAR_IF([ac_cv_posix_semaphores_enabled], [no], [
262+
@@ -5826,6 +5914,14 @@ AS_VAR_IF([ac_cv_posix_semaphores_enabled], [no], [
263263
])
264264

265265
dnl Multiprocessing check for broken sem_getvalue
@@ -275,10 +275,10 @@ index d0d5405..7c1577d 100644
275275
AC_RUN_IFELSE([
276276
AC_LANG_SOURCE([
277277
diff --git a/pyconfig.h.in b/pyconfig.h.in
278-
index 6d370f6..0321d25 100644
278+
index 7d3537e..67cd2e7 100644
279279
--- a/pyconfig.h.in
280280
+++ b/pyconfig.h.in
281-
@@ -1553,6 +1553,9 @@
281+
@@ -1549,6 +1549,9 @@
282282
/* Define if mvwdelch in curses.h is an expression. */
283283
#undef MVWDELCH_IS_EXPRESSION
284284

mingw-w64-python/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 42413c760051a255b7f78f6aba99b022363049e3 Mon Sep 17 00:00:00 2001
1+
From 63d2c038b475245846a1d479f702ab30368427c3 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:13 +0530

mingw-w64-python/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f1879c5fdc867848ffbb5390242138046bf37ae8 Mon Sep 17 00:00:00 2001
1+
From 2d52bf72a784e7f5ff89cbddb350aa539ae88b53 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:14 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <[email protected]>
1313
1 file changed, 15 insertions(+)
1414

1515
diff --git a/configure.ac b/configure.ac
16-
index 7c1577d..894002c 100644
16+
index 7e3846c..765ff33 100644
1717
--- a/configure.ac
1818
+++ b/configure.ac
1919
@@ -550,6 +550,9 @@ then

mingw-w64-python/0005-Add-default-configuration-for-MINGW.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a054a8a55d3d2e70f9c7e33976bffa09c4cf6582 Mon Sep 17 00:00:00 2001
1+
From fafd2e61f502981baf9d81140b818ae3d09071a6 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:15 +0530
@@ -53,7 +53,7 @@ index 0000000..03fde9e
5353
+
5454
+ac_cv_have_size_t_format=no
5555
diff --git a/configure.ac b/configure.ac
56-
index 894002c..03a9660 100644
56+
index 765ff33..ef1f816 100644
5757
--- a/configure.ac
5858
+++ b/configure.ac
5959
@@ -1205,6 +1205,28 @@ AC_CACHE_CHECK([for -Wl,--no-as-needed], [ac_cv_wl_no_as_needed], [

mingw-w64-python/0006-configure-enable-largefile-support-by-default-for-Mi.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 671bba9ba076a2744a75a83f9379a52cb2842142 Mon Sep 17 00:00:00 2001
1+
From cbb660150f138e1ef875969042ef30cdad614ab1 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:16 +0530
@@ -18,10 +18,10 @@ Co-authored-by: Christoph Reiter <[email protected]>
1818
1 file changed, 4 insertions(+)
1919

2020
diff --git a/configure.ac b/configure.ac
21-
index 03a9660..eb94ad9 100644
21+
index ef1f816..85299cd 100644
2222
--- a/configure.ac
2323
+++ b/configure.ac
24-
@@ -3160,6 +3160,10 @@ dnl LFS does not work with Emscripten 3.1
24+
@@ -3163,6 +3163,10 @@ dnl LFS does not work with Emscripten 3.1
2525
AS_CASE([$ac_sys_system],
2626
[Emscripten], [have_largefile_support="no"]
2727
)

mingw-w64-python/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From bf7f62deadbfdf89f7b38398a117656ac9b45c0d Mon Sep 17 00:00:00 2001
1+
From f69aac67d82e59b863d6ef11852e8e5487dce983 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:18 +0530
@@ -10,10 +10,10 @@ Co-authored-by: Naveen M K <[email protected]>
1010
1 file changed, 15 insertions(+)
1111

1212
diff --git a/configure.ac b/configure.ac
13-
index eb94ad9..fe4663b 100644
13+
index 85299cd..dfc052e 100644
1414
--- a/configure.ac
1515
+++ b/configure.ac
16-
@@ -6891,6 +6891,16 @@ do
16+
@@ -6892,6 +6892,16 @@ do
1717
THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
1818
done
1919

@@ -30,7 +30,7 @@ index eb94ad9..fe4663b 100644
3030
AC_SUBST([SRCDIRS])
3131
SRCDIRS="\
3232
Modules \
33-
@@ -6913,6 +6923,11 @@ SRCDIRS="\
33+
@@ -6914,6 +6924,11 @@ SRCDIRS="\
3434
Python \
3535
Python/frozen_modules \
3636
Python/deepfreeze"

mingw-w64-python/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From dafdc1bf867ba7b961543fff9aaf9248ae5d64bb Mon Sep 17 00:00:00 2001
1+
From 87107b310c2aed894c379eadf7dd3d4a874e097e Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:19 +0530
@@ -33,10 +33,10 @@ index 8ef0f20..1f21d35 100644
3333
_tracemalloc _tracemalloc.c
3434

3535
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
36-
index 2277cae..0bc4d83 100644
36+
index d529851..1482169 100644
3737
--- a/Modules/posixmodule.c
3838
+++ b/Modules/posixmodule.c
39-
@@ -365,6 +365,26 @@ corresponding Unix manual entries for more information on calls.");
39+
@@ -366,6 +366,26 @@ corresponding Unix manual entries for more information on calls.");
4040
# define HAVE_PIPE 1
4141
# define HAVE_FSYNC 1
4242
# define fsync _commit
@@ -63,7 +63,7 @@ index 2277cae..0bc4d83 100644
6363
#endif /* ! __WATCOMC__ || __QNX__ */
6464

6565
/*[clinic input]
66-
@@ -442,7 +462,7 @@ extern char *ctermid_r(char *);
66+
@@ -443,7 +463,7 @@ extern char *ctermid_r(char *);
6767
# endif
6868
#endif
6969

@@ -72,7 +72,7 @@ index 2277cae..0bc4d83 100644
7272
# ifdef HAVE_DIRECT_H
7373
# include <direct.h>
7474
# endif
75-
@@ -453,7 +473,7 @@ extern char *ctermid_r(char *);
75+
@@ -454,7 +474,7 @@ extern char *ctermid_r(char *);
7676
# include <process.h>
7777
# endif
7878
# include <malloc.h>
@@ -81,7 +81,7 @@ index 2277cae..0bc4d83 100644
8181

8282
#ifndef MAXPATHLEN
8383
# if defined(PATH_MAX) && PATH_MAX > 1024
84-
@@ -1590,9 +1610,9 @@ error:
84+
@@ -1591,9 +1611,9 @@ error:
8585
** man environ(7).
8686
*/
8787
#include <crt_externs.h>
@@ -94,7 +94,7 @@ index 2277cae..0bc4d83 100644
9494
static PyObject *
9595
convertenviron(void)
9696
diff --git a/configure.ac b/configure.ac
97-
index fe4663b..56bcf8b 100644
97+
index dfc052e..8eda015 100644
9898
--- a/configure.ac
9999
+++ b/configure.ac
100100
@@ -755,6 +755,14 @@ then

mingw-w64-python/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 15a5dad86e97f4195c38f9bdb3645662e6e8a865 Mon Sep 17 00:00:00 2001
1+
From fb135fa6c418aec58a749fcc045430505c9691bf Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:20 +0530
@@ -58,10 +58,10 @@ index e2d5322..368291d 100644
5858

5959
typedef struct {
6060
diff --git a/configure.ac b/configure.ac
61-
index 56bcf8b..5b51d92 100644
61+
index 8eda015..bbbbc94 100644
6262
--- a/configure.ac
6363
+++ b/configure.ac
64-
@@ -4463,6 +4463,13 @@ done
64+
@@ -4466,6 +4466,13 @@ done
6565
IFS=$as_save_IFS
6666
AC_MSG_RESULT([$DBM_CFLAGS $DBM_LIBS])
6767

mingw-w64-python/0010-pyport.h-Add-support-for-MINGW.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2d115632ee24a8f811aefd9d1d54f15dfc145325 Mon Sep 17 00:00:00 2001
1+
From 8444575641a12e57d2d030ebf91d649ae79d37db Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
33
44
Date: Thu, 17 Jun 2021 18:51:23 +0530

0 commit comments

Comments
 (0)