diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 524104298..8a0cff098 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ {% set version = "3.15.0" %} -{% set dev = "rc1" %} +{% set dev = "rc2" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 2 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -64,7 +64,7 @@ package: source: - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/ - sha256: f84dad680ab2147417d2739355c2678f0f9acffe4ae8ef77895de1454b384b07 + sha256: 8d93af5eaaaea5adfd41bd786a7ba3f03f2ad1ab57c6a65e0b963deab91d5ad7 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index 7738cab65..9a58073e1 100644 --- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,4 +1,4 @@ -From eb229fe06a9aa324841dd8df909b35e95f105baa Mon Sep 17 00:00:00 2001 +From b51c74365f2f62c84d2f174c2d68e38ca4e16765 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/27] Win32: Change FD_SETSIZE from 512 to 2048 @@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index 2c56dbc6a54..845ff4732ca 100644 +index b9fb7762e3d..e6102e8c589 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -45,7 +45,7 @@ diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index 36688ede2..f1298ce19 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,4 +1,4 @@ -From f7a4cb3806d5f0934c8dd57084dc4201b2593df8 Mon Sep 17 00:00:00 2001 +From dbc1c91f800e11a162eb14c42c806564802ba167 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/27] Win32: Do not download externals diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 36e53a443..b2533caaa 100644 --- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,4 +1,4 @@ -From e226645fc9dc1028758afdae88dd0703dc803f17 Mon Sep 17 00:00:00 2001 +From 028de8f3d29a0aec65b80d36c00faf975268c9c0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/27] Fix find_library so that it looks in sys.prefix/lib @@ -25,7 +25,7 @@ index 583c47daff3..ab9b01c87e2 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 35ac5b6bfd6..614482a10fb 100644 +index 015c62b31a1..e08c9520576 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -136,7 +136,8 @@ def dllist(): @@ -38,7 +38,7 @@ index 35ac5b6bfd6..614482a10fb 100644 '%s.dylib' % name, '%s.framework/%s' % (name, name)] for name in possible: -@@ -437,10 +438,30 @@ def _findLib_ld(name): +@@ -436,10 +437,30 @@ def _findLib_ld(name): pass # result will be None return result @@ -70,4 +70,4 @@ index 35ac5b6bfd6..614482a10fb 100644 + _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) - # Listing loaded libraries on other systems will try to use + # On platforms which provide dl_iterate_phdr(), dllist() is implemented diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index ac8937618..a70b23b3f 100644 --- a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,4 +1,4 @@ -From ee51d7baf498bc5e30b34c357137af6ea57cb4a7 Mon Sep 17 00:00:00 2001 +From b57538bcca07d9195b7d47eb3536baa36fdc2908 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS @@ -23,7 +23,7 @@ index 1e75993480a..ff96c8e1990 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index 6199567bd77..ea370c2f686 100644 +index c322d5c4b4c..e237c58d6bc 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -52,6 +52,7 @@ diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index ff1c65c7b..822ce4fe9 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From a6dcb685cb77f162310ef77576af382188d8413e Mon Sep 17 00:00:00 2001 +From 8650098599959095301e15c2cecf74da06e709c3 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/27] Unvendor openssl @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index 8d931bba28a..744ce0c540a 100644 +index 79f705a1ed3..744ce0c540a 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -91,6 +91,7 @@ @@ -112,8 +112,8 @@ index 8d931bba28a..744ce0c540a 100644 - $(libffiDir)$(ArchName)\ - $(libffiOutDir)include $(ExternalsDir)\mpdecimal-4.0.0\ -- $(ExternalsDir)openssl-3.5.7\ -- $(ExternalsDir)openssl-bin-3.5.7\$(ArchName)\ +- $(ExternalsDir)openssl-3.5.8\ +- $(ExternalsDir)openssl-bin-3.5.8\$(ArchName)\ - $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ - $(ExternalsDir)\zlib-1.3.1\ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 19b96b025..4d34774f3 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From c82644b76c5b87ad02ffeb3f2fb5c3fab2a0ec80 Mon Sep 17 00:00:00 2001 +From 75dc2785a2034779d3cc6853822356f447f00d84 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/27] Unvendor sqlite3 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index 054aa22c2..fd88fa19f 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From 9614157a8e1240021175a1bdba71dfa48b221e09 Mon Sep 17 00:00:00 2001 +From 7a3599e45ce0e457d8c17ba47ac180d1388d4d03 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/27] Add CondaEcosystemModifyDllSearchPath() @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando 1 file changed, 95 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 3933c321ed2..9a4a8c5a024 100644 +index 516d467141a..156524cc7ce 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -88,6 +88,10 @@ diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 2e6a02868..ab21da5bd 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 58cc3e9ea869f279ad53387ca1d4f5d963cfbed4 Mon Sep 17 00:00:00 2001 +From 691c214c845462b7a49266e568312946a80dcd67 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/27] Doing d1trimfile @@ -181,7 +181,7 @@ index 46e34a5ea82..fb1589557da 100644 diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj -index 17b98c9d9ec..b3998a47f22 100644 +index 198563b4d8d..2f184fc8399 100644 --- a/PCbuild/_freeze_module.vcxproj +++ b/PCbuild/_freeze_module.vcxproj @@ -93,6 +93,10 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 584aa475e..39f0e7607 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From 27a1c43342bdd71ab21655d58b98c21851028df2 Mon Sep 17 00:00:00 2001 +From 3c3434e2e741c2c2bf1a9a4bab9d71dc6d1935c1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/27] cross compile darwin @@ -29,7 +29,7 @@ index 36489d4fdd9..37278847c0a 100644 try: import plistlib diff --git a/configure b/configure -index 08a7c663ce0..b3a36e07e38 100755 +index a68a98c5a4d..a7d9fa69814 100755 --- a/configure +++ b/configure @@ -4155,6 +4155,9 @@ then @@ -53,7 +53,7 @@ index 08a7c663ce0..b3a36e07e38 100755 ;; *-*-cygwin*) diff --git a/configure.ac b/configure.ac -index ead82d6da0b..603549bd039 100644 +index ed8b53dd3a4..cc9554e5b39 100644 --- a/configure.ac +++ b/configure.ac @@ -333,6 +333,9 @@ then diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index c788eefb4..e45be6e36 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From fce019e7c00ed65a1c1b14ae3ee9b7531e6c354c Mon Sep 17 00:00:00 2001 +From aab9fadd4195b340be1eed7152f2de1242939a6e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 Subject: [PATCH 10/27] Fix TZPATH on windows @@ -8,7 +8,7 @@ Subject: [PATCH 10/27] Fix TZPATH on windows 1 file changed, 2 insertions(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 47415adce04..654a1ef225f 100644 +index 4f8ebf15d36..1230a48208e 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -175,6 +175,7 @@ def joinuser(*args): @@ -19,7 +19,7 @@ index 47415adce04..654a1ef225f 100644 _BASE_PREFIX = os.path.normpath(sys.base_prefix) _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) # Mutex guarding initialization of _CONFIG_VARS. -@@ -550,6 +551,7 @@ def _init_config_vars(): +@@ -553,6 +554,7 @@ def _init_config_vars(): if os.name == 'nt': _init_non_posix(_CONFIG_VARS) _CONFIG_VARS['VPATH'] = sys._vpath diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch index 8be99f6b7..ed95965d3 100644 --- a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch @@ -1,4 +1,4 @@ -From a3d547708bdce0eb9f17e6409293bf06fb2d5174 Mon Sep 17 00:00:00 2001 +From 724d20af3df5662b352ec3c18bc7b45db157cd6e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/27] Make dyld search work with SYSTEM_VERSION_COMPAT=1 @@ -18,7 +18,7 @@ and this code using 10.16 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index ccc57e347b0..443e36ac559 100644 +index 746034c8004..d42585c08c5 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1503,7 +1503,7 @@ copy_com_pointer(PyObject *self, PyObject *args) diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index e8924c798..6a709fb74 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 7efa40ac8ac7d2a3f34203188392e2680c7a9ea9 Mon Sep 17 00:00:00 2001 +From 1ced7d55db59f46781fe0e12548a5adc464b7ba1 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/27] Unvendor bzip2 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index fcb79a636..5f8ba2d09 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 1de3976ee79619c64747cb1791849a4468629906 Mon Sep 17 00:00:00 2001 +From edca283a374525e9b4faa0d9f8542ffa4affb5bd Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/27] Unvendor libffi diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 8971139f4..ad4039e78 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,12 +1,12 @@ -From 69b3709de40a425c513ba888e40e9c826adcb74b Mon Sep 17 00:00:00 2001 +From 889a90193669f738dca1a7b8e6be73eae5e32001 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/27] Unvendor tcltk --- PCbuild/_tkinter.vcxproj | 6 ------ - PCbuild/tcltk.props | 14 +++++--------- - 2 files changed, 5 insertions(+), 15 deletions(-) + PCbuild/tcltk.props | 12 +++++------- + 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index de9358312ac..3fe2c29c823 100644 @@ -26,7 +26,7 @@ index de9358312ac..3fe2c29c823 100644 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 28e8c0db4d1..f975a79829a 100644 +index 1d6b4f57f09..22a3f0be581 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -12,15 +12,13 @@ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 9197faf44..359132678 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 0affa1ab854a78115557b2515077085e7b0bfed6 Mon Sep 17 00:00:00 2001 +From ffa2c3c2a6771f1a924bb67d55c7a2265d2bc16d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/27] unvendor xz diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 15cbce181..cfe65a60c 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From 20ffbea56b8882626cdc4efa661946d300ccc542 Mon Sep 17 00:00:00 2001 +From cd2d9d38cfeed1e5a8dd7aa9a91358353f6a8025 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/27] unvendor zlib diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index 9a54f6fee..a7f464f78 100644 --- a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,4 +1,4 @@ -From 54038153d469b5a64ed5f7ba6c524ccf400a1b72 Mon Sep 17 00:00:00 2001 +From 65cafcd546fc3f9989bcced6cf3b258ef7504e6c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/27] Do not pass -g to GCC when not Py_DEBUG @@ -10,10 +10,10 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index b3a36e07e38..a88a92ffe0a 100755 +index a7d9fa69814..3499d97f59e 100755 --- a/configure +++ b/configure -@@ -5845,9 +5845,9 @@ if test $ac_test_CFLAGS; then +@@ -5850,9 +5850,9 @@ if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -25,7 +25,7 @@ index b3a36e07e38..a88a92ffe0a 100755 fi else if test "$GCC" = yes; then -@@ -9758,7 +9758,7 @@ then +@@ -9769,7 +9769,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else @@ -35,10 +35,10 @@ index b3a36e07e38..a88a92ffe0a 100755 ;; *) diff --git a/configure.ac b/configure.ac -index 603549bd039..b7224bff208 100644 +index cc9554e5b39..8b818a7a7d7 100644 --- a/configure.ac +++ b/configure.ac -@@ -2376,7 +2376,7 @@ then +@@ -2384,7 +2384,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 0c287d900..154c55696 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From ec1edcdf2b4ab8849899256cfa51ce77406d5ec4 Mon Sep 17 00:00:00 2001 +From 54fc26859353a5361f603c88f704b17e5726b147 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/27] Unvendor expat diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 552ca92c4..ff73be2de 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 794a3c5afb0549e2a4f19463c8368736df454bf7 Mon Sep 17 00:00:00 2001 +From 0e65951e0e93ff7d6835f1b561ce37717b816a4f Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 Subject: [PATCH 19/27] 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 c2820741404..b1711d1d385 100644 +index 8008a96c1c8..5174b36bc53 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,7 +38,6 @@ CC= @CC@ diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch index d726fb0dc..42c31a9ed 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From de8ce0d2b0a413ba8b5ebe5e20caac359f633033 Mon Sep 17 00:00:00 2001 +From dc47a794138f800714283dc19cbf896406afb7ca Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/27] Don't checksharedmods if cross-compiling @@ -10,10 +10,10 @@ Subject: [PATCH 20/27] Don't checksharedmods if cross-compiling create mode 100755 if_runnable.sh diff --git a/Makefile.pre.in b/Makefile.pre.in -index b1711d1d385..3aae0d606c1 100644 +index 5174b36bc53..374c3e7a70d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1632,7 +1632,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) +@@ -1633,7 +1633,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) else \ $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py --generate-missing-stdlib-info; \ fi diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 464579614..cd461d6d4 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 70897fdc6b76649ba3237fe0be1a488c79592823 Mon Sep 17 00:00:00 2001 +From ef6353504192f7cdc868c49dec3bcf39200655a9 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 Subject: [PATCH 21/27] Override configure LIBFFI @@ -8,10 +8,10 @@ Subject: [PATCH 21/27] Override configure LIBFFI 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index a88a92ffe0a..37493df13e5 100755 +index 3499d97f59e..9dfc1191b20 100755 --- a/configure +++ b/configure -@@ -15917,7 +15917,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -15929,7 +15929,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes then : have_libffi=yes diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index bc6c775ba..ae319a9ee 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From fceffd4d643ec1400a50dbe9cb04627c74cfa266 Mon Sep 17 00:00:00 2001 +From 0b8863c5e493e62060b90a6f7ee08d241f0872c2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/27] Unvendor libmpdec diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index bc8a37371..8e2b090c5 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From bdb99ff3e6a76fdfca612429330ce20b91087372 Mon Sep 17 00:00:00 2001 +From 27bed0708db7fc097428e303aeb9e219c9111304 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/27] Brand conda-forge diff --git a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch index 4e8d6d672..73f483000 100644 --- a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch +++ b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch @@ -1,4 +1,4 @@ -From 52267d279c5af48b68ce4d785b10139873b6cc2d Mon Sep 17 00:00:00 2001 +From e23a12e19347d11d8bb04e3a752b0d47b30bf79f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 24/27] Do not define pid_t as it might conflict with the @@ -30,19 +30,19 @@ index 008a7d37726..7829e9cc714 100644 module _testcapi [clinic start generated code]*/ diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c -index 799390c2705..c8454f866bf 100644 +index fb18a866e62..7ef862ef1ad 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c -@@ -26,6 +26,10 @@ - # include // sysctlbyname() - #endif +@@ -15,6 +15,10 @@ + #include "frameobject.h" // PyFrame_New() + #include "marshal.h" // PyMarshal_WriteLongToFile() +#ifdef _MSC_VER +typedef int pid_t; +#endif + #ifdef bool - # error "The public headers should not include , see gh-48924" + # error "The public headers should not include , see gh-90904" #endif diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c index 99b9e96760d..932fef0497f 100644 @@ -75,7 +75,7 @@ index 45e509d0030..65b87843b20 100644 "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n" "--\n" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 2a25be16e61..5fe43d52835 100644 +index 0b42b059541..a8aff655bd1 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -222,6 +222,7 @@ diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch index 6f3c04329..3a84b0fe4 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,4 +1,4 @@ -From edda9d185e32eef8592264398e83e95f117b15d1 Mon Sep 17 00:00:00 2001 +From ea36797c92b325459e176e6856a03b9ce1d2335c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Jul 2025 18:07:54 +0200 Subject: [PATCH 25/27] Unvendor zstd @@ -199,8 +199,9 @@ index eec666e5eaf..5028bb5592d 100644 Header Files - -- Header Files\zstd -- ++ + Header Files\zstd + - - Header Files\zstd - @@ -262,9 +263,8 @@ index eec666e5eaf..5028bb5592d 100644 - Header Files\zstd - - -+ - Header Files\zstd - +- Header Files\zstd +- - + Header Files\zstd diff --git a/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch b/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch index dc2d37bbf..2ac6b7c1d 100644 --- a/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch +++ b/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch @@ -1,4 +1,4 @@ -From 11f11d345af9c01aa41399952a9ecd7f6ab13b8e Mon Sep 17 00:00:00 2001 +From 22389266909ab9f32571100e4b7c338aba13561d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 2 Dec 2025 09:46:56 -0800 Subject: [PATCH 26/27] Set Py_GIL_DISABLED in windows to match unix diff --git a/recipe/patches/0027-More-unixy-layout-for-windows.patch b/recipe/patches/0027-More-unixy-layout-for-windows.patch index 005c7ddd3..4fb9cc769 100644 --- a/recipe/patches/0027-More-unixy-layout-for-windows.patch +++ b/recipe/patches/0027-More-unixy-layout-for-windows.patch @@ -1,4 +1,4 @@ -From 853e54ebe2cd914b719dc274be11211d72883a32 Mon Sep 17 00:00:00 2001 +From a8d05c46483270c807cf22d5487f70b8997cbc31 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 22 May 2026 14:21:19 -0700 Subject: [PATCH 27/27] More unixy layout for windows @@ -12,10 +12,10 @@ See https://github.com/conda-forge/cfep/pull/65 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Lib/site.py b/Lib/site.py -index d06549b8df8..4ec8fab1450 100644 +index 89e136d7b10..5bc762fdd03 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -764,6 +764,7 @@ def getsitepackages(prefixes=None): +@@ -770,6 +770,7 @@ def getsitepackages(prefixes=None): "site-packages") sitepackages.append(path) else: @@ -24,7 +24,7 @@ index d06549b8df8..4ec8fab1450 100644 sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) return sitepackages diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 654a1ef225f..9021d40e809 100644 +index 1230a48208e..955a7896ca3 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -58,6 +58,16 @@ @@ -54,7 +54,7 @@ index 654a1ef225f..9021d40e809 100644 'user': 'nt_user', } diff --git a/Modules/getpath.py b/Modules/getpath.py -index ea370c2f686..c7f85c5c5c1 100644 +index e237c58d6bc..4ccd9179e84 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -190,9 +190,9 @@