summaryrefslogtreecommitdiff
path: root/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch')
-rw-r--r--dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch b/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
deleted file mode 100644
index c552831cfd6b..000000000000
--- a/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5f96e35b873d6230970fd63ba2e706bbd3f4e26f Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 8 Sep 2023 16:54:48 -0400
-Subject: [PATCH 1/7] python dependency: ensure that setuptools doesn't inject
- itself into distutils
-
-We do not use setuptools for anything, and only lightly use distutils.
-Unpredictable issues can occur due to setuptools monkey-patching, which
-interferes with our intended use. Tell setuptools to simply never get
-involved.
-
-Note: while it's otherwise possible to check if the probe is run using
-sys.executable and avoid forking, setuptools unconditionally injects
-itself at startup in a way that requires subprocess isolation to
-disable.
-
-(cherry picked from commit 9f610ad5b72ea91de2d7aeb6f3266d0a7477062e)
----
- mesonbuild/dependencies/python.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
-index 160772888..f04494674 100644
---- a/mesonbuild/dependencies/python.py
-+++ b/mesonbuild/dependencies/python.py
-@@ -113,7 +113,9 @@ class BasicPythonExternalProgram(ExternalProgram):
-
- with importlib.resources.path('mesonbuild.scripts', 'python_info.py') as f:
- cmd = self.get_command() + [str(f)]
-- p, stdout, stderr = mesonlib.Popen_safe(cmd)
-+ env = os.environ.copy()
-+ env['SETUPTOOLS_USE_DISTUTILS'] = 'stdlib'
-+ p, stdout, stderr = mesonlib.Popen_safe(cmd, env=env)
-
- try:
- info = json.loads(stdout)
---
-2.42.0
-