summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
index 19502fa9cd..2e0a4b1bbe 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
@@ -1,4 +1,4 @@
1From a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 1From e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 19 Nov 2018 14:24:26 +0100 3Date: Mon, 19 Nov 2018 14:24:26 +0100
4Subject: [PATCH] python module: do not manipulate the environment when calling 4Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 1 file changed, 1 insertion(+), 5 deletions(-) 12 1 file changed, 1 insertion(+), 5 deletions(-)
13 13
14diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py 14diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
15index 14386f9..118a15f 100644 15index 9aea6bd..8c13ede 100644
16--- a/mesonbuild/dependencies/python.py 16--- a/mesonbuild/dependencies/python.py
17+++ b/mesonbuild/dependencies/python.py 17+++ b/mesonbuild/dependencies/python.py
18@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', 18@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
19 empty.name = 'python' 19 empty.name = 'python'
20 return empty 20 return empty
21 21
@@ -25,7 +25,7 @@ index 14386f9..118a15f 100644
25 try: 25 try:
26 return PythonPkgConfigDependency(name, env, kwargs, installation, True) 26 return PythonPkgConfigDependency(name, env, kwargs, installation, True)
27 finally: 27 finally:
28@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', 28@@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
29 os.environ[name] = value 29 os.environ[name] = value
30 elif name in os.environ: 30 elif name in os.environ:
31 del os.environ[name] 31 del os.environ[name]