Merge pull request #642 from h-vetinari/rc3

CPython 3.12.0rc3

recipe/meta.yaml

@@ -1,6 +1,6 @@
 {% set version = "3.12.0" %}
-{% set dev = "rc2" %}
-{% set dev_ = "rc2_" %}
+{% set dev = "rc3" %}
+{% set dev_ = "rc3_" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
 {% set ver3nd = ''.join(version.split('.')[0:3]) %}
@@ -46,32 +46,32 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
-    md5: c6da177d411956a24f15988e22dcfdb8
+    md5: cead7d4428e88e8de9219731c21edb74
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
-      - patches/0005-Win32-Do-not-download-externals.patch
-      - patches/0006-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
-      - patches/0008-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
-      - patches/0009-Unvendor-openssl.patch
-      - patches/0010-Unvendor-sqlite3.patch
-      - patches/0012-Add-CondaEcosystemModifyDllSearchPath.patch
-      - patches/0014-Doing-d1trimfile.patch
+      - patches/0002-Win32-Do-not-download-externals.patch
+      - patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
+      - patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
+      - patches/0005-Unvendor-openssl.patch
+      - patches/0006-Unvendor-sqlite3.patch
+      - patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
+      - patches/0008-Doing-d1trimfile.patch
       # https://github.com/python/cpython/pull/23523
-      - patches/0015-cross-compile-darwin.patch
-      - patches/0016-Fix-TZPATH-on-windows.patch
+      - patches/0009-cross-compile-darwin.patch
+      - patches/0010-Fix-TZPATH-on-windows.patch
       # https://github.com/python/cpython/pull/24324
-      - patches/0017-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
-      - patches/0019-Unvendor-bzip2.patch
-      - patches/0020-Unvendor-libffi.patch
-      - patches/0021-Unvendor-tcltk.patch
-      - patches/0022-unvendor-xz.patch
-      - patches/0023-unvendor-zlib.patch
-      - patches/0024-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
-      - patches/0025-Unvendor-expat.patch
-      - patches/0026-Remove-unused-readelf.patch
-      - patches/0027-Don-t-checksharedmods.patch
-      - patches/0028-Override-configure-LIBFFI.patch
+      - patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
+      - patches/0012-Unvendor-bzip2.patch
+      - patches/0013-Unvendor-libffi.patch
+      - patches/0014-Unvendor-tcltk.patch
+      - patches/0015-unvendor-xz.patch
+      - patches/0016-unvendor-zlib.patch
+      - patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
+      - patches/0018-Unvendor-expat.patch
+      - patches/0019-Remove-unused-readelf.patch
+      - patches/0020-Don-t-checksharedmods-if-cross-compiling.patch
+      - patches/0021-Override-configure-LIBFFI.patch
 
 build:
   number: {{ build_number }}

recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,4 +1,4 @@
-From 352aea809b3ac6ad852ae58a534df12cb239a7c3 Mon Sep 17 00:00:00 2001
+From 5bdb40fdc8c6fce6f6770dff2f9e97db1b1f6391 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
 Subject: [PATCH 01/21] Win32: Change FD_SETSIZE from 512 to 2048

recipe/patches/0005-Win32-Do-not-download-externals.patch → recipe/patches/0002-Win32-Do-not-download-externals.patch

@@ -1,4 +1,4 @@
-From dfca874ef88f9d2bab2702a3e44349cc068a8e32 Mon Sep 17 00:00:00 2001
+From befb192e6f80b62a8b3975dce6cbd5d5b033dbb1 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 7 Sep 2017 11:35:47 +0100
 Subject: [PATCH 02/21] Win32: Do not download externals

recipe/patches/0006-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch → recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch

@@ -1,4 +1,4 @@
-From c914c94b6e310e54b7db327f89ac3397e1a630af Mon Sep 17 00:00:00 2001
+From a0ee25bbb5b930c076b1f21ff010fb771936bb09 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 5 Dec 2017 22:47:59 +0000
 Subject: [PATCH 03/21] Fix find_library so that it looks in sys.prefix/lib

recipe/patches/0008-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch → recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch

@@ -1,4 +1,4 @@
-From eb5010769c25ec98c9157984776ed692d60557ca Mon Sep 17 00:00:00 2001
+From 23e3234467d3bccd6ee39cb8171c346aa97d7e80 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sat, 27 Oct 2018 18:48:30 +0100
 Subject: [PATCH 04/21] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS

recipe/patches/0009-Unvendor-openssl.patch → recipe/patches/0005-Unvendor-openssl.patch

@@ -1,4 +1,4 @@
-From 81d228d0b094f2f401b0110121fc1c1c8c42b018 Mon Sep 17 00:00:00 2001
+From 99fe809142a3896dff90dd5be01807c164e1eb75 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 24 Nov 2018 20:38:02 -0600
 Subject: [PATCH 05/21] Unvendor openssl

recipe/patches/0010-Unvendor-sqlite3.patch → recipe/patches/0006-Unvendor-sqlite3.patch

@@ -1,4 +1,4 @@
-From 073a3c8e8d088eca1cdaf21510e56fa51ba900bd Mon Sep 17 00:00:00 2001
+From df95082bb1e96ce6f49949d60eedde992cdde03d Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Tue, 5 Oct 2021 12:42:06 -0700
 Subject: [PATCH 06/21] Unvendor sqlite3

recipe/patches/0012-Add-CondaEcosystemModifyDllSearchPath.patch → recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch

@@ -1,4 +1,4 @@
-From ba0ddc7e55bc4833319debbb41e1456ea7390564 Mon Sep 17 00:00:00 2001
+From 5fd4be6005d39c58c9739a7518f243d1ea4b63a5 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 24 Dec 2019 18:37:17 +0100
 Subject: [PATCH 07/21] Add CondaEcosystemModifyDllSearchPath()

recipe/patches/0014-Doing-d1trimfile.patch → recipe/patches/0008-Doing-d1trimfile.patch

@@ -1,4 +1,4 @@
-From 3e5726d9e714fae5662f8b41d6c6ded333205b9a Mon Sep 17 00:00:00 2001
+From fb9d98398f49caa104467c41b8d23891426477d4 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 21:47:47 +0100
 Subject: [PATCH 08/21] Doing d1trimfile

recipe/patches/0015-cross-compile-darwin.patch → recipe/patches/0009-cross-compile-darwin.patch

@@ -1,4 +1,4 @@
-From 2dd67b717728e878fd334db00b88d713c4eee22e Mon Sep 17 00:00:00 2001
+From 63959de9af24cf2b696dddec31e33f7f85fda339 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 2 Oct 2020 00:03:12 +0200
 Subject: [PATCH 09/21] cross compile darwin

recipe/patches/0016-Fix-TZPATH-on-windows.patch → recipe/patches/0010-Fix-TZPATH-on-windows.patch

@@ -1,4 +1,4 @@
-From e84d62a4fa332c0411bc007660c2214a2836b174 Mon Sep 17 00:00:00 2001
+From 6cdabad153ba90aedf6c2b1b9f3f911e1601c689 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 7 Oct 2020 10:08:30 -0500
 Subject: [PATCH 10/21] Fix TZPATH on windows

recipe/patches/0017-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch → recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch

@@ -1,4 +1,4 @@
-From 6cc73d28ed2ee989a5f9c5415bd2f0487b073fa8 Mon Sep 17 00:00:00 2001
+From 91ad1580106357c51cf2b81c5f30a2bac4909fce Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 25 Jan 2021 03:28:08 -0600
 Subject: [PATCH 11/21] Make dyld search work with SYSTEM_VERSION_COMPAT=1

recipe/patches/0019-Unvendor-bzip2.patch → recipe/patches/0012-Unvendor-bzip2.patch

@@ -1,4 +1,4 @@
-From 5dff4b62514aa73889658ac8365f527b717d29fd Mon Sep 17 00:00:00 2001
+From 6666bbb1790d683b5bc7dd997ac6d44e9681158c Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:56:27 -0700
 Subject: [PATCH 12/21] Unvendor bzip2

recipe/patches/0020-Unvendor-libffi.patch → recipe/patches/0013-Unvendor-libffi.patch

@@ -1,4 +1,4 @@
-From 3991fe7ee7672ded0cf778165151c6442c455dbd Mon Sep 17 00:00:00 2001
+From 56fadcadf4ebf8eb09e815101e9c8149cda583c5 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 03:07:40 -0700
 Subject: [PATCH 13/21] Unvendor libffi

recipe/patches/0021-Unvendor-tcltk.patch → recipe/patches/0014-Unvendor-tcltk.patch

@@ -1,4 +1,4 @@
-From 67d06a3fbae9263bac8ae8942b54567112015bb1 Mon Sep 17 00:00:00 2001
+From d099a5686041ff74fe31d487890e390d0d75fdea Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 20 Aug 2021 10:23:51 -0700
 Subject: [PATCH 14/21] Unvendor tcltk

recipe/patches/0022-unvendor-xz.patch → recipe/patches/0015-unvendor-xz.patch

@@ -1,4 +1,4 @@
-From cb9c1afe14c25589969ad46806195feca297064d Mon Sep 17 00:00:00 2001
+From 31e4b84a08ce2fa0bc280c79f67143fa5ca622af Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 25 Sep 2021 10:07:05 -0700
 Subject: [PATCH 15/21] unvendor xz

recipe/patches/0023-unvendor-zlib.patch → recipe/patches/0016-unvendor-zlib.patch

@@ -1,4 +1,4 @@
-From e9657a7e15c6043155273eab55dfa09dcf43abe8 Mon Sep 17 00:00:00 2001
+From ad6b3f24b6d6c6663d66804c652b53734a1d4a00 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Sep 2021 15:21:55 -0700
 Subject: [PATCH 16/21] unvendor zlib

recipe/patches/0024-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch → recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch

@@ -1,4 +1,4 @@
-From 88259bef6fa5a504c0d95b1cee71c243cb9c8502 Mon Sep 17 00:00:00 2001
+From 11f3cfab6d1f545a94010ed3e42d002f3698a8b5 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:45:28 +0100
 Subject: [PATCH 17/21] Do not pass -g to GCC when not Py_DEBUG

recipe/patches/0025-Unvendor-expat.patch → recipe/patches/0018-Unvendor-expat.patch

@@ -1,4 +1,4 @@
-From f7ad4cbebe4116ca0f74161739198fd57579a6d9 Mon Sep 17 00:00:00 2001
+From eec3d786f18cbe7bb4bd3f5120a1d9337ea7c44b Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Mar 2023 23:07:10 -0500
 Subject: [PATCH 18/21] Unvendor expat

recipe/patches/0026-Remove-unused-readelf.patch → recipe/patches/0019-Remove-unused-readelf.patch

@@ -1,4 +1,4 @@
-From f3d31031109c715aa06f51d7b1ab96dc6c600116 Mon Sep 17 00:00:00 2001
+From a76ef7db2fa773f66cec71f2c0cfeb2397ea7237 Mon Sep 17 00:00:00 2001
 From: Charles Bousseau <cbousseau@anaconda.com>
 Date: Thu, 25 May 2023 17:56:53 -0400
 Subject: [PATCH 19/21] Remove unused readelf
@@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``.
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 0372c1a49c..7acd876bc8 100644
+index 09ceccda1d..725dc24187 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -38,7 +38,6 @@ CC=		@CC@

recipe/patches/0027-Don-t-checksharedmods.patch → recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch

@@ -1,4 +1,4 @@
-From 1b6604b52651f3088fe07dde50cfc8093124f68a Mon Sep 17 00:00:00 2001
+From 6c35e24c3fc3e1b4b7533e838a7bd27dd9c3648c Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 1 Sep 2023 23:32:14 +0200
 Subject: [PATCH 20/21] Don't checksharedmods if cross-compiling
@@ -10,7 +10,7 @@ Subject: [PATCH 20/21] Don't checksharedmods if cross-compiling
  create mode 100755 if_runnable.sh
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 7acd876..e50db99 100644
+index 725dc24187..77c806ecb3 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -989,7 +989,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt
@@ -19,12 +19,12 @@ index 7acd876..e50db99 100644
  checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
 -	@$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py
 +	@$(RUNSHARED) $(srcdir)/if_runnable.sh $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py
-
+ 
  .PHONY: rundsymutil
  rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
 diff --git a/if_runnable.sh b/if_runnable.sh
 new file mode 100755
-index 0000000..14f84a8
+index 0000000000..14f84a8597
 --- /dev/null
 +++ b/if_runnable.sh
 @@ -0,0 +1,5 @@

recipe/patches/0028-Override-configure-LIBFFI.patch → recipe/patches/0021-Override-configure-LIBFFI.patch

@@ -1,4 +1,4 @@
-From 5ab5e612bc92c70747add5eb198483b7852919f5 Mon Sep 17 00:00:00 2001
+From 6b49d42b7038ec0f08c284531543f400e66f4e5e Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Tue, 5 Sep 2023 21:51:31 +0200
 Subject: [PATCH 21/21] Override configure LIBFFI