From 5122972c5d1a710e94144c5d2985178008fe3861 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 15 Aug 2025 12:33:46 +1100 Subject: [PATCH 1/2] python v3.14.0rc2 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a53f9b5a5..d323ac65d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ {% set version = "3.14.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' %} @@ -46,7 +46,7 @@ package: source: - 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: 48c4518c06dcb675c24276c56f69b9fd + md5: ee7ae62b6ddc66eeca1591730be0f1c4 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch From 4200f03300cabfa2bca5af17bc76b7207e408530 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 15 Aug 2025 12:35:44 +1100 Subject: [PATCH 2/2] rebase patches --- recipe/meta.yaml | 3 - ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 4 +- ...0002-Win32-Do-not-download-externals.patch | 4 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 4 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 4 +- recipe/patches/0005-Unvendor-openssl.patch | 8 +-- recipe/patches/0006-Unvendor-sqlite3.patch | 4 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 4 +- recipe/patches/0008-Doing-d1trimfile.patch | 4 +- .../patches/0009-cross-compile-darwin.patch | 4 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 4 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 4 +- recipe/patches/0012-Unvendor-bzip2.patch | 4 +- recipe/patches/0013-Unvendor-libffi.patch | 4 +- recipe/patches/0014-Unvendor-tcltk.patch | 4 +- recipe/patches/0015-unvendor-xz.patch | 4 +- recipe/patches/0016-unvendor-zlib.patch | 4 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 4 +- recipe/patches/0018-Unvendor-expat.patch | 4 +- .../patches/0019-Remove-unused-readelf.patch | 4 +- ...t-checksharedmods-if-cross-compiling.patch | 4 +- .../0021-Override-configure-LIBFFI.patch | 4 +- recipe/patches/0022-Unvendor-libmpdec.patch | 4 +- recipe/patches/0023-Brand-conda-forge.patch | 4 +- ...d_t-as-it-might-conflict-with-the-ac.patch | 6 +- recipe/patches/0025-Unvendor-zstd.patch | 14 ++--- ...pport-older-macOS-deployment-targets.patch | 57 ------------------- 27 files changed, 58 insertions(+), 118 deletions(-) delete mode 100644 recipe/patches/0026-Support-older-macOS-deployment-targets.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d323ac65d..e1eed8d71 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,9 +77,6 @@ source: {% endif %} - patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch - patches/0025-Unvendor-zstd.patch - # See https://github.com/python/cpython/pull/137211 - # Applied in main, but will get backported soon - - patches/0026-Support-older-macOS-deployment-targets.patch build: number: {{ build_number }} 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 4c2c90be8..97eb478cc 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,7 +1,7 @@ -From 406ff9385980d807288ac43e5237e390e34ffc6a Mon Sep 17 00:00:00 2001 +From e8908bf96ebdaa8c8c63822882e5c9d7dcc7dd97 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index 103eee9bb..a801f114d 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,7 +1,7 @@ -From 33a046766d230a1f905090b5b882e2c4b22523b0 Mon Sep 17 00:00:00 2001 +From a34c5549ec1dcbb110da9cdd77299e7d9e2995d4 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 02/26] Win32: Do not download externals +Subject: [PATCH 02/25] Win32: Do not download externals --- PCbuild/build.bat | 2 +- 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 dee8af250..b7218324a 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,7 +1,7 @@ -From fbab041f8189f99bd036cbc7bca7fe1910466792 Mon Sep 17 00:00:00 2001 +From 742dba07be139f4a27c303f5a51a3ef905d05d2b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 03/26] Fix find_library so that it looks in sys.prefix/lib +Subject: [PATCH 03/25] Fix find_library so that it looks in sys.prefix/lib first --- 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 8937e7626..4692cca09 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,7 +1,7 @@ -From 0e4125a1d1baaf3088eaa9d3cd0a8374ae6ed578 Mon Sep 17 00:00:00 2001 +From f476c9403172b03b1d15687d6069c627591ea8ee Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 04/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 Co-authored-by: Isuru Fernando diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 3a0a4df86..f4dda3207 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,7 +1,7 @@ -From 6638478c7e99fab390add1999af353618f067b7a Mon Sep 17 00:00:00 2001 +From 249ae549ed63f82062e9402b9f1da76f67b3ecc1 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 05/26] Unvendor openssl +Subject: [PATCH 05/25] Unvendor openssl Co-authored-by: Isuru Fernando --- @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index ddc7696d276..94fb385c1fb 100644 +index e1c2ff3fe3c..94fb385c1fb 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -67,6 +67,7 @@ @@ -105,7 +105,7 @@ index ddc7696d276..94fb385c1fb 100644 -- $(ExternalsDir)sqlite-3.49.1.0\ +- $(ExternalsDir)sqlite-3.50.4.0\ - $(ExternalsDir)bzip2-1.0.8\ - $(ExternalsDir)xz-5.2.5\ - $(ExternalsDir)libffi-3.4.4\ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index ddc923f00..e46cba769 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ -From be8c7e23fd312f654fda9cc68bc98976f3accab2 Mon Sep 17 00:00:00 2001 +From 56a2efffff6e6bdf14dfe36025273b08f3e09d3d Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 -Subject: [PATCH 06/26] Unvendor sqlite3 +Subject: [PATCH 06/25] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 11 +++++------ diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index 7a3f377d6..bc351a2f3 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ -From 5ed61636f3b43611294249ce785f209be0e529f0 Mon Sep 17 00:00:00 2001 +From 9b551bad1d653e00c8f603c9ac715d477f4b54e7 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 -Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 07/25] Add CondaEcosystemModifyDllSearchPath() The python interpreter is modifed so that it works as if the python interpreter was called with the following conda directories. diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 5519cf7fc..05c640719 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,7 +1,7 @@ -From 11282f5451b71d2f08d0725c17be2656625ecd1a Mon Sep 17 00:00:00 2001 +From ed850117acbd94cd6781b26f15cb26171fa100e9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 -Subject: [PATCH 08/26] Doing d1trimfile +Subject: [PATCH 08/25] Doing d1trimfile --- PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 52b9f26cc..6080031a7 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,7 +1,7 @@ -From 6e8bd58784f1900fd8f8aa0377408c2ea524e51a Mon Sep 17 00:00:00 2001 +From 04941c416759c3d2cb1160bc1fb20ef91ebb8475 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 -Subject: [PATCH 09/26] cross compile darwin +Subject: [PATCH 09/25] cross compile darwin By Isuru Fernando. --- diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index 22e5cb033..38eefe4a0 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,7 +1,7 @@ -From f0362a6ad4fbd45cef9a018506156c73c43912b5 Mon Sep 17 00:00:00 2001 +From 21e4b984cc9f3eef9172c992fbf3498c0366f855 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 -Subject: [PATCH 10/26] Fix TZPATH on windows +Subject: [PATCH 10/25] Fix TZPATH on windows --- Lib/sysconfig/__init__.py | 2 ++ 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 af4220ea8..5ea646559 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,7 +1,7 @@ -From 4e986f7404111e72cca2493f1915049c6d876b4a Mon Sep 17 00:00:00 2001 +From 84971d125017a0d8969cc61a0919da498bae5550 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 -Subject: [PATCH 11/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1 +Subject: [PATCH 11/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1 In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15` or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index c237c3566..85563ba95 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,7 +1,7 @@ -From e66e5c601fae8d37393b1726322a5616887fd73b Mon Sep 17 00:00:00 2001 +From cf783001714ca0896c1370670c56343dcaff2448 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 -Subject: [PATCH 12/26] Unvendor bzip2 +Subject: [PATCH 12/25] Unvendor bzip2 --- PCbuild/_bz2.vcxproj | 15 +++++---------- diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index cb11d087a..f1904b4a7 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,7 +1,7 @@ -From fc2bcd062c621685043ece8016e07bef9f2a9fec Mon Sep 17 00:00:00 2001 +From 6922424527bca3d956baaf7eb4e831ce92d957ba Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 -Subject: [PATCH 13/26] Unvendor libffi +Subject: [PATCH 13/25] Unvendor libffi --- PCbuild/libffi.props | 17 ++++------------- diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 6186b8bb0..15bf865ea 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,7 +1,7 @@ -From 18a9e470f63afca24de7e954a65595294f62791c Mon Sep 17 00:00:00 2001 +From 487ae304670841945f948743ce7151043ea6365c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 -Subject: [PATCH 14/26] Unvendor tcltk +Subject: [PATCH 14/25] Unvendor tcltk --- PCbuild/_tkinter.vcxproj | 6 ------ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 7ab27d800..ed75e7436 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,7 +1,7 @@ -From ca6b7e8df08a6dbeb119737beaa777400479d31d Mon Sep 17 00:00:00 2001 +From 897ea766e34c742660bf5b9589657488e67f222d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 -Subject: [PATCH 15/26] unvendor xz +Subject: [PATCH 15/25] unvendor xz --- PCbuild/_lzma.vcxproj | 10 +++------- diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index fe117edea..dee5c9f63 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,7 +1,7 @@ -From f446705fe6e9ed28f1e9b6fa83daf97a514d5a39 Mon Sep 17 00:00:00 2001 +From dbdd7900afa68af8d577e8a4d933d5c339fb5efe Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 -Subject: [PATCH 16/26] unvendor zlib +Subject: [PATCH 16/25] unvendor zlib --- PCbuild/pythoncore.vcxproj | 14 ++----- 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 9a2457c26..597bf4a4b 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,7 +1,7 @@ -From 3077875a1b8dd9e73eb7004bb08f2c133fd6baa9 Mon Sep 17 00:00:00 2001 +From 459ff688c3fe5e63ba2cb091365798a0cf15cf84 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 17/26] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 17/25] Do not pass -g to GCC when not Py_DEBUG This bloats our exe and our modules a lot. --- diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 6a784249c..8aabbf1fc 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,7 +1,7 @@ -From 556b0f60a5339196f00b8cd326cafec3807911b4 Mon Sep 17 00:00:00 2001 +From 35328bbca38158bbfdead8823f3e3d69061dc350 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 -Subject: [PATCH 18/26] Unvendor expat +Subject: [PATCH 18/25] Unvendor expat --- PCbuild/_elementtree.vcxproj | 24 ++---------- diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index aca8f8d75..14e394373 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,7 +1,7 @@ -From aa6701fbe14f36a4774d2e104e961aecfdf48aac Mon Sep 17 00:00:00 2001 +From e55d87118a2f3bc35f7a73c197457285daac4eb5 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 -Subject: [PATCH 19/26] Remove unused readelf +Subject: [PATCH 19/25] Remove unused readelf readelf has been dropped. .. date: 2022-11-02-10-56-40 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 3866de384..42775d312 100644 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch @@ -1,7 +1,7 @@ -From 8ff78ee5d704fde23f5702c9f5c78f1ccf088d4b Mon Sep 17 00:00:00 2001 +From ef8b87298f017b658563fe0a56e5d4bc59f476da Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 -Subject: [PATCH 20/26] Don't checksharedmods if cross-compiling +Subject: [PATCH 20/25] Don't checksharedmods if cross-compiling --- Makefile.pre.in | 2 +- diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index ddb53e222..c380f6484 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,7 +1,7 @@ -From 9f283830d03a723bb25554dda5fbe1fa3fa196fa Mon Sep 17 00:00:00 2001 +From bd48167cb9448a8c449618746983b85ad3059473 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 -Subject: [PATCH 21/26] Override configure LIBFFI +Subject: [PATCH 21/25] Override configure LIBFFI --- configure | 2 +- diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index d1e5639f6..c1227fd24 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,7 +1,7 @@ -From c54586cd33cd510e3b76f18f1faa75f74584934b Mon Sep 17 00:00:00 2001 +From 29c8cebb6375d641f4535cc768a58e1cf91b48ad Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 -Subject: [PATCH 22/26] Unvendor libmpdec +Subject: [PATCH 22/25] Unvendor libmpdec --- PCbuild/_decimal.vcxproj | 50 +++++----------------------------------- diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 6d1100f98..246edd49d 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,7 +1,7 @@ -From 3031acc96bb1302f55dbf0cc4a0abec9dc3249f6 Mon Sep 17 00:00:00 2001 +From c97fb37b266608dfc373eecf4fbf253c19f0e63d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 -Subject: [PATCH 23/26] Brand conda-forge +Subject: [PATCH 23/25] Brand conda-forge --- Lib/platform.py | 1 + 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 88d0ffa98..ccf118b4c 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,7 +1,7 @@ -From d659c16622730e983cdd75fc7228e32391d2acb0 Mon Sep 17 00:00:00 2001 +From db7463fa61da246089907979628193c463cf3932 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 -Subject: [PATCH 24/26] Do not define pid_t as it might conflict with the +Subject: [PATCH 24/25] Do not define pid_t as it might conflict with the actual definition --- @@ -100,7 +100,7 @@ index 710a737ebcc..92d327b1e35 100644 #if _MSC_VER >= 1200 /* This file only exists in VC 6.0 or higher */ diff --git a/Python/remote_debug.h b/Python/remote_debug.h -index 8f9b6cd4c49..ee75bbb8e43 100644 +index 8f9b6cd4c49..20cd65dd818 100644 --- a/Python/remote_debug.h +++ b/Python/remote_debug.h @@ -28,6 +28,9 @@ extern "C" { diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch index a796ae3e2..39ce12aa7 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,7 +1,7 @@ -From 5b70911c8769d86d244055d49692bae4a8abd6af Mon Sep 17 00:00:00 2001 +From 2faf112c78c6c1e153ec0fedb5ac74971bd39d7d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Jul 2025 18:07:54 +0200 -Subject: [PATCH 25/26] Unvendor zstd +Subject: [PATCH 25/25] Unvendor zstd --- PCbuild/_zstd.vcxproj | 58 +------------ @@ -195,8 +195,9 @@ index eec666e5eaf..5028bb5592d 100644 Header Files - -- Header Files\zstd -- ++ + Header Files\zstd + - - Header Files\zstd - @@ -258,9 +259,8 @@ index eec666e5eaf..5028bb5592d 100644 - Header Files\zstd - - -+ - Header Files\zstd - +- Header Files\zstd +- - + Header Files\zstd diff --git a/recipe/patches/0026-Support-older-macOS-deployment-targets.patch b/recipe/patches/0026-Support-older-macOS-deployment-targets.patch deleted file mode 100644 index c0c3f8496..000000000 --- a/recipe/patches/0026-Support-older-macOS-deployment-targets.patch +++ /dev/null @@ -1,57 +0,0 @@ -From dba7d1e800ec989c178b4120da6f6ff4f7d99c2a Mon Sep 17 00:00:00 2001 -From: Brandt Bucher -Date: Wed, 21 May 2025 11:40:54 -0400 -Subject: [PATCH 26/26] Support older "macOS" deployment targets - ---- - Python/jit.c | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/Python/jit.c b/Python/jit.c -index e232cc1f7d9..9fbd8a18590 100644 ---- a/Python/jit.c -+++ b/Python/jit.c -@@ -69,10 +69,6 @@ jit_alloc(size_t size) - #else - int flags = MAP_ANONYMOUS | MAP_PRIVATE; - int prot = PROT_READ | PROT_WRITE; --# ifdef MAP_JIT -- flags |= MAP_JIT; -- prot |= PROT_EXEC; --# endif - unsigned char *memory = mmap(NULL, size, prot, flags, -1, 0); - int failed = memory == MAP_FAILED; - #endif -@@ -118,11 +114,8 @@ mark_executable(unsigned char *memory, size_t size) - int old; - int failed = !VirtualProtect(memory, size, PAGE_EXECUTE_READ, &old); - #else -- int failed = 0; - __builtin___clear_cache((char *)memory, (char *)memory + size); --#ifndef MAP_JIT -- failed = mprotect(memory, size, PROT_EXEC | PROT_READ); --#endif -+ int failed = mprotect(memory, size, PROT_EXEC | PROT_READ); - #endif - if (failed) { - jit_error("unable to protect executable memory"); -@@ -528,9 +521,6 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz - if (memory == NULL) { - return -1; - } --#ifdef MAP_JIT -- pthread_jit_write_protect_np(0); --#endif - // Collect memory stats - OPT_STAT_ADD(jit_total_memory_size, total_size); - OPT_STAT_ADD(jit_code_size, code_size); -@@ -568,9 +558,6 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz - data += group->data_size; - assert(code == memory + code_size); - assert(data == memory + code_size + state.trampolines.size + data_size); --#ifdef MAP_JIT -- pthread_jit_write_protect_np(1); --#endif - if (mark_executable(memory, total_size)) { - jit_free(memory, total_size); - return -1;