summaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/python.py
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@gmail.com>2024-05-27 22:55:39 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2024-06-23 13:23:31 +0300
commita111c28ecef721af960721c26b40f4e5108760c7 (patch)
treec6bbe61d3e0e5e8e4061d58bc5f8ae22d19e208a /mesonbuild/dependencies/python.py
parentc0ca35c8fd796bea4bd92f88b03cb3d6abd2096c (diff)
downloadmeson-a111c28ecef721af960721c26b40f4e5108760c7.tar.gz
Add support for detecting free-threaded Python on Windows
This does a couple of things: 1. Scrape the `Py_GIL_DISABLED` sysconfig var, which is the best way as of today to determine whether the target interpreter was built with `--disable-gil` 2. link against the correct libpython 3. On Windows, work around a known issue in the python.org installer with a missing define in `pyconfig.h`, which the CPython devs have said is unlikely to be fixed since headers are shared between the regular and free-threaded builds in a single NSIS installer.
Diffstat (limited to 'mesonbuild/dependencies/python.py')
-rw-r--r--mesonbuild/dependencies/python.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
index 17c807caf..851c63070 100644
--- a/mesonbuild/dependencies/python.py
+++ b/mesonbuild/dependencies/python.py
@@ -29,6 +29,7 @@ if T.TYPE_CHECKING:
install_paths: T.Dict[str, str]
is_pypy: bool
is_venv: bool
+ is_freethreaded: bool
link_libpython: bool
sysconfig_paths: T.Dict[str, str]
paths: T.Dict[str, str]
@@ -91,6 +92,7 @@ class BasicPythonExternalProgram(ExternalProgram):
'install_paths': {},
'is_pypy': False,
'is_venv': False,
+ 'is_freethreaded': False,
'link_libpython': False,
'sysconfig_paths': {},
'paths': {},
@@ -146,6 +148,7 @@ class _PythonDependencyBase(_Base):
self.variables = python_holder.info['variables']
self.paths = python_holder.info['paths']
self.is_pypy = python_holder.info['is_pypy']
+ self.is_freethreaded = python_holder.info['is_freethreaded']
# The "-embed" version of python.pc / python-config was introduced in 3.8,
# and distutils extension linking was changed to be considered a non embed
# usage. Before then, this dependency always uses the embed=True handling
@@ -161,6 +164,12 @@ class _PythonDependencyBase(_Base):
else:
self.major_version = 2
+ # pyconfig.h is shared between regular and free-threaded builds in the
+ # Windows installer from python.org, and hence does not define
+ # Py_GIL_DISABLED correctly. So do it here:
+ if mesonlib.is_windows() and self.is_freethreaded:
+ self.compile_args += ['-DPy_GIL_DISABLED']
+
def find_libpy(self, environment: 'Environment') -> None:
if self.is_pypy:
if self.major_version == 3:
@@ -220,7 +229,10 @@ class _PythonDependencyBase(_Base):
else:
if limited_api:
vernum = vernum[0]
- libpath = Path('libs') / f'python{vernum}.lib'
+ if self.is_freethreaded:
+ libpath = Path('libs') / f'python{vernum}t.lib'
+ else:
+ libpath = Path('libs') / f'python{vernum}.lib'
# For a debug build, pyconfig.h may force linking with
# pythonX_d.lib (see meson#10776). This cannot be avoided
# and won't work unless we also have a debug build of