Set Py_GIL_DISABLED in windows to match unix (#836)

conda-forge-admin · web-flow · commit 0df6e72062cb · 2025-12-02T20:35:42.000+01:00
automerged PR by conda-forge/automerge-action
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -4,7 +4,7 @@
 {% 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 = 3 %}
 
 # this makes the linter happy
 {% set channel_targets = channel_targets or 'conda-forge main' %}
@@ -77,6 +77,9 @@ source:
 {% endif %}
       - patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
       - patches/0025-Unvendor-zstd.patch
+{% if freethreading == "yes" %}
+      - patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch
+{% endif %}
 
 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
@@ -1,7 +1,7 @@
 From 3dff368f2f15764584cd9d90234ae7e8248e4e4d 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/25] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/26] 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
@@ -1,7 +1,7 @@
 From 15bfc5e613ae654bd685f65d975d79ce88d3853d 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/25] Win32: Do not download externals
+Subject: [PATCH 02/26] 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
@@ -1,7 +1,7 @@
 From 2e9e95c2e3aa8d212a302de52f19d129c5068d57 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/25] Fix find_library so that it looks in sys.prefix/lib
+Subject: [PATCH 03/26] 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
@@ -1,7 +1,7 @@
 From 12999f1ec012f5c3859aa23070a5d293b852afda 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/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
+Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  is not 0
 
 Co-authored-by: Isuru Fernando<isuruf@gmail.com>
diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch
@@ -1,7 +1,7 @@
 From f3da6c061da6528ac2aa9069418e2abec3e81bec 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/25] Unvendor openssl
+Subject: [PATCH 05/26] Unvendor openssl
 
 Co-authored-by: Isuru Fernando <isuruf@gmail.com>
 ---
diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch
@@ -1,7 +1,7 @@
 From 73585456429c8ce96c088d3403afd7e430bdeb85 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/25] Unvendor sqlite3
+Subject: [PATCH 06/26] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj | 11 +++++------
diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,7 +1,7 @@
 From 966dfbe7e1972661885959ec72d34d52af373698 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/25] Add CondaEcosystemModifyDllSearchPath()
+Subject: [PATCH 07/26] 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
@@ -1,7 +1,7 @@
 From 17412eb7031d69a13c749f5d6a5f9cdef01c1188 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/25] Doing d1trimfile
+Subject: [PATCH 08/26] Doing d1trimfile
 
 ---
  PCbuild/_asyncio.vcxproj            | 20 ++++++++++++++++++++
diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch
@@ -1,7 +1,7 @@
 From 4a750134d0e82bf5e843bcde03a28c4ef7e6c036 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/25] cross compile darwin
+Subject: [PATCH 09/26] 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
@@ -1,7 +1,7 @@
 From 53c0cb3b5f5c206ead42a55dcbc39ce1453dfd38 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/25] Fix TZPATH on windows
+Subject: [PATCH 10/26] 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
@@ -1,7 +1,7 @@
 From fb9d535290c32d9ff02820949cab3d2c212d6397 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/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1
+Subject: [PATCH 11/26] 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
@@ -1,7 +1,7 @@
 From 7c194e8eecd10c4f16b25110e53647a87bb71ec6 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/25] Unvendor bzip2
+Subject: [PATCH 12/26] Unvendor bzip2
 
 ---
  PCbuild/_bz2.vcxproj         | 15 +++++----------
diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch
@@ -1,7 +1,7 @@
 From fafc2c3880a6c1e872142b8ed040a562edb45738 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/25] Unvendor libffi
+Subject: [PATCH 13/26] Unvendor libffi
 
 ---
  PCbuild/libffi.props | 17 ++++-------------
diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch
@@ -1,7 +1,7 @@
 From bac07ba9b9bdbcc560af20d9eadc38bd30a7fc9b 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/25] Unvendor tcltk
+Subject: [PATCH 14/26] Unvendor tcltk
 
 ---
  PCbuild/_tkinter.vcxproj |  6 ------
diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch
@@ -1,7 +1,7 @@
 From 4492573c31d9b6989cf878c1b133870ccc93886f 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/25] unvendor xz
+Subject: [PATCH 15/26] unvendor xz
 
 ---
  PCbuild/_lzma.vcxproj | 10 +++-------
diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch
@@ -1,7 +1,7 @@
 From aca0e2c3d51aaa449f7e849b7fbc26233d611298 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/25] unvendor zlib
+Subject: [PATCH 16/26] 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
@@ -1,7 +1,7 @@
 From 34a225d86b9b9d43fe12b130101e35779c4322bc 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/25] Do not pass -g to GCC when not Py_DEBUG
+Subject: [PATCH 17/26] 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
@@ -1,7 +1,7 @@
 From 97ae235561329f2310cd2f03b0e6321b448601ca 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/25] Unvendor expat
+Subject: [PATCH 18/26] Unvendor expat
 
 ---
  PCbuild/_elementtree.vcxproj         | 24 ++----------
diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch
@@ -1,7 +1,7 @@
 From 2e87abf11bbb270eb6971923b3854f599a5da6c9 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/25] Remove unused readelf
+Subject: [PATCH 19/26] 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
@@ -1,7 +1,7 @@
 From 00a945ee9d283d6d189f782092d06348d2ccef00 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/25] Don't checksharedmods if cross-compiling
+Subject: [PATCH 20/26] 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
@@ -1,7 +1,7 @@
 From fdef0a3f1a886320e3acd5f01fdbc0907a32d9d8 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/25] Override configure LIBFFI
+Subject: [PATCH 21/26] Override configure LIBFFI
 
 ---
  configure | 2 +-
diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch
@@ -1,7 +1,7 @@
 From 76f71b983fbe97118ff7e9c187e689226fbdd296 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 16 Aug 2024 21:34:43 -0500
-Subject: [PATCH 22/25] Unvendor libmpdec
+Subject: [PATCH 22/26] Unvendor libmpdec
 
 ---
  PCbuild/_decimal.vcxproj | 50 +++++-----------------------------------
diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch
@@ -1,7 +1,7 @@
 From 3ae72a4b59fec1f5a8f2431f33b37888ebe2f646 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 28 Aug 2024 11:12:22 -0500
-Subject: [PATCH 23/25] Brand conda-forge
+Subject: [PATCH 23/26] 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
@@ -1,7 +1,7 @@
 From dfd3c9a8237180a5456a13ecc3c1e19cb52ccd1a Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sun, 12 Jan 2025 10:37:29 +0530
-Subject: [PATCH 24/25] Do not define pid_t as it might conflict with the
+Subject: [PATCH 24/26] Do not define pid_t as it might conflict with the
  actual definition
 
 ---
diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch
@@ -1,7 +1,7 @@
 From 0c0f398f475a9d61fbec7e004647299cd7e9e049 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwelk@xhochy.com>
 Date: Tue, 22 Jul 2025 18:07:54 +0200
-Subject: [PATCH 25/25] Unvendor zstd
+Subject: [PATCH 25/26] Unvendor zstd
 
 ---
  PCbuild/_zstd.vcxproj         |  58 +------------
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
@@ -0,0 +1,25 @@
+From bdffefd91e576916a70808069885b1c33d6b4f62 Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Tue, 2 Dec 2025 09:46:56 -0800
+Subject: [PATCH 26/26] Set Py_GIL_DISABLED in windows to match unix
+
+This is not set upstream because the windows distribution supports
+free-threaded and default builds at the same time. We have the
+luxury of not having to do that.
+---
+ PC/pyconfig.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/PC/pyconfig.h b/PC/pyconfig.h
+index 92d327b1e35..ed0d9c0592b 100644
+--- a/PC/pyconfig.h
++++ b/PC/pyconfig.h
+@@ -105,6 +105,8 @@ WIN32 is still required for the locale module.
+ #if Py_GIL_DISABLED == 0
+ #undef Py_GIL_DISABLED
+ #endif
++#else
++#define Py_GIL_DISABLED 1
+ #endif
+ 
+ /* Compiler specific defines */
diff --git a/recipe/run_test.py b/recipe/run_test.py
@@ -102,7 +102,7 @@
 
 import ssl
 print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION)
-CONDA_OPENSSL_VERSION = os.getenv('openssl')
+CONDA_OPENSSL_VERSION = os.getenv('openssl').split(".")[0]
 assert CONDA_OPENSSL_VERSION in ssl.OPENSSL_VERSION
 
 # See https://github.com/conda-forge/python-feedstock/issues/718 for context:
