From 69c2142d0f138dd8a8a9a4890d1e08e2d545c1bd Mon Sep 17 00:00:00 2001 From: "Anthony Sottile (deadsnakes)" Date: Thu, 31 Oct 2024 08:52:58 +0000 Subject: [PATCH] update to d07dcce6935364cab807e0df931ed09b088ade69 (nightly) --- changelogs/nightly/jammy | 6 ++++++ changelogs/nightly/noble | 6 ++++++ cpython | 2 +- patches/destshared-location.patch | 2 +- patches/disable-sem-check.diff | 6 +++--- patches/distutils-install-layout.diff | 18 +++++++++--------- patches/link-opt.diff | 2 +- patches/multiarch.diff | 2 +- patches/reproducible-buildinfo.diff | 2 +- patches/sysconfigdata-name.patch | 6 +++--- 10 files changed, 32 insertions(+), 20 deletions(-) diff --git a/changelogs/nightly/jammy b/changelogs/nightly/jammy index eed1b7f..2df9d37 100644 --- a/changelogs/nightly/jammy +++ b/changelogs/nightly/jammy @@ -1,3 +1,9 @@ +python3.14 (3.14.0~a1-183-gd07dcce693-1+jammy1) jammy; urgency=medium + + * Update to v3.14.0a1-183-gd07dcce693. + + -- Anthony Sottile (deadsnakes) Thu, 31 Oct 2024 08:52:57 +0000 + python3.14 (3.14.0~a1-164-g2ab377a47c-1+jammy1) jammy; urgency=medium * Update to v3.14.0a1-164-g2ab377a47c. diff --git a/changelogs/nightly/noble b/changelogs/nightly/noble index 4e4099f..e3df41a 100644 --- a/changelogs/nightly/noble +++ b/changelogs/nightly/noble @@ -1,3 +1,9 @@ +python3.14 (3.14.0~a1-183-gd07dcce693-1+noble1) noble; urgency=medium + + * Update to v3.14.0a1-183-gd07dcce693. + + -- Anthony Sottile (deadsnakes) Thu, 31 Oct 2024 08:52:57 +0000 + python3.14 (3.14.0~a1-164-g2ab377a47c-1+noble1) noble; urgency=medium * Update to v3.14.0a1-164-g2ab377a47c. diff --git a/cpython b/cpython index 2ab377a..d07dcce 160000 --- a/cpython +++ b/cpython @@ -1 +1 @@ -Subproject commit 2ab377a47c8290f8bf52c8ffb5d7fc4c45452611 +Subproject commit d07dcce6935364cab807e0df931ed09b088ade69 diff --git a/patches/destshared-location.patch b/patches/destshared-location.patch index e31111c..b884300 100644 --- a/patches/destshared-location.patch +++ b/patches/destshared-location.patch @@ -12,7 +12,7 @@ Forwarded: no 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f9f2994..7885e84 100644 +index fa4a2fd..809c87e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -176,7 +176,7 @@ EXT_SUFFIX= @EXT_SUFFIX@ diff --git a/patches/disable-sem-check.diff b/patches/disable-sem-check.diff index 88bf615..c2c1b4e 100644 --- a/patches/disable-sem-check.diff +++ b/patches/disable-sem-check.diff @@ -9,10 +9,10 @@ Subject: disable-sem-check 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac -index 44a30aa..7c31216 100644 +index e0ddbf4..d338f80 100644 --- a/configure.ac +++ b/configure.ac -@@ -6082,12 +6082,17 @@ AC_CACHE_CHECK([whether POSIX semaphores are enabled], [ac_cv_posix_semaphores_e +@@ -6087,12 +6087,17 @@ AC_CACHE_CHECK([whether POSIX semaphores are enabled], [ac_cv_posix_semaphores_e [ac_cv_posix_semaphores_enabled=no], [ac_cv_posix_semaphores_enabled=yes]) ) @@ -36,7 +36,7 @@ index 44a30aa..7c31216 100644 dnl Multiprocessing check for broken sem_getvalue AC_CACHE_CHECK([for broken sem_getvalue], [ac_cv_broken_sem_getvalue], -@@ -6119,12 +6124,17 @@ AC_CACHE_CHECK([for broken sem_getvalue], [ac_cv_broken_sem_getvalue], +@@ -6124,12 +6129,17 @@ AC_CACHE_CHECK([for broken sem_getvalue], [ac_cv_broken_sem_getvalue], [ac_cv_broken_sem_getvalue=yes], [ac_cv_broken_sem_getvalue=yes]) ) diff --git a/patches/distutils-install-layout.diff b/patches/distutils-install-layout.diff index 085a9a8..c3f2281 100644 --- a/patches/distutils-install-layout.diff +++ b/patches/distutils-install-layout.diff @@ -200,7 +200,7 @@ index 035913c..c23db4f 100644 else: # other platforms diff --git a/Makefile.pre.in b/Makefile.pre.in -index db5bad8..7af1406 100644 +index aa7fa4e..d18d5c3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -166,7 +166,7 @@ WHEEL_PKG_DIR= @WHEEL_PKG_DIR@ @@ -229,10 +229,10 @@ index 1f1bfcb..411b6d7 100644 VENV_LANDMARK = 'pyvenv.cfg' ZIP_LANDMARK = f'{platlibdir}/python{VERSION_MAJOR}{VERSION_MINOR}{ABI_THREAD}.zip' diff --git a/configure b/configure -index 7a778b4..fd77376 100755 +index 3989de8..63f4b55 100755 --- a/configure +++ b/configure -@@ -25010,11 +25010,11 @@ fi +@@ -25102,11 +25102,11 @@ fi @@ -246,7 +246,7 @@ index 7a778b4..fd77376 100755 PLATLIBDIR="lib" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-platlibdir" >&5 -@@ -25033,7 +25033,7 @@ then +@@ -25125,7 +25125,7 @@ then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } PLATLIBDIR="$withval" @@ -255,7 +255,7 @@ index 7a778b4..fd77376 100755 else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } -@@ -25047,9 +25047,9 @@ fi +@@ -25139,9 +25139,9 @@ fi if test x$PLATFORM_TRIPLET = x; then @@ -268,10 +268,10 @@ index 7a778b4..fd77376 100755 diff --git a/configure.ac b/configure.ac -index 42daf1c..de5a19e 100644 +index 6a98cc5..400d6f9 100644 --- a/configure.ac +++ b/configure.ac -@@ -6278,11 +6278,11 @@ fi +@@ -6283,11 +6283,11 @@ fi AC_SUBST([BINLIBDEST]) @@ -285,7 +285,7 @@ index 42daf1c..de5a19e 100644 AC_SUBST([PLATLIBDIR]) PLATLIBDIR="lib" AC_MSG_CHECKING([for --with-platlibdir]) -@@ -6301,7 +6301,7 @@ if test -n "$withval" -a "$withval" != yes -a "$withval" != no +@@ -6306,7 +6306,7 @@ if test -n "$withval" -a "$withval" != yes -a "$withval" != no then AC_MSG_RESULT([yes]) PLATLIBDIR="$withval" @@ -294,7 +294,7 @@ index 42daf1c..de5a19e 100644 else AC_MSG_RESULT([no]) fi], -@@ -6311,9 +6311,9 @@ fi], +@@ -6316,9 +6316,9 @@ fi], dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST([PY_ENABLE_SHARED]) if test x$PLATFORM_TRIPLET = x; then diff --git a/patches/link-opt.diff b/patches/link-opt.diff index 87feea7..c19f747 100644 --- a/patches/link-opt.diff +++ b/patches/link-opt.diff @@ -9,7 +9,7 @@ Subject: link-opt 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index de5a19e..44a30aa 100644 +index 400d6f9..e0ddbf4 100644 --- a/configure.ac +++ b/configure.ac @@ -3501,8 +3501,8 @@ then diff --git a/patches/multiarch.diff b/patches/multiarch.diff index 7310dfe..2163653 100644 --- a/patches/multiarch.diff +++ b/patches/multiarch.diff @@ -25,7 +25,7 @@ index c8ced46..0bdf61d 100644 srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) if os.name == 'posix': diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7af1406..9c0ab3b 100644 +index d18d5c3..0b379d7 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1785,6 +1785,7 @@ Python/interpconfig.o: $(srcdir)/Python/interpconfig.c $(srcdir)/Python/config_c diff --git a/patches/reproducible-buildinfo.diff b/patches/reproducible-buildinfo.diff index 3f6377c..ed509ca 100644 --- a/patches/reproducible-buildinfo.diff +++ b/patches/reproducible-buildinfo.diff @@ -9,7 +9,7 @@ Subject: reproducible-buildinfo 1 file changed, 2 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9c0ab3b..4a18b4e 100644 +index 0b379d7..315ac64 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1743,6 +1743,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ diff --git a/patches/sysconfigdata-name.patch b/patches/sysconfigdata-name.patch index bbcb700..546321a 100644 --- a/patches/sysconfigdata-name.patch +++ b/patches/sysconfigdata-name.patch @@ -28,10 +28,10 @@ index 0bdf61d..be085ec 100644 def _init_posix(vars): diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4a18b4e..f9f2994 100644 +index 315ac64..fa4a2fd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2636,8 +2636,10 @@ libinstall: all $(srcdir)/Modules/xxmodule.c +@@ -2642,8 +2642,10 @@ libinstall: all $(srcdir)/Modules/xxmodule.c esac; \ done; \ done @@ -45,7 +45,7 @@ index 4a18b4e..f9f2994 100644 @ # If app store compliance has been configured, apply the patch to the @ # installed library code. The patch has been previously validated against diff --git a/configure.ac b/configure.ac -index 7c31216..686ac30 100644 +index d338f80..f38abbe 100644 --- a/configure.ac +++ b/configure.ac @@ -164,7 +164,7 @@ AC_ARG_WITH([build-python],