blob: 2e0a4b1bbe64a0bffc9715fef4718ea1b8642a3c [file] [log] [blame]
Patrick Williams705982a2024-01-12 09:51:57 -06001From e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001
Brad Bishopa5c52ff2018-11-23 10:55:50 +13002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 19 Nov 2018 14:24:26 +0100
4Subject: [PATCH] python module: do not manipulate the environment when calling
5 pkg-config
6
7Upstream-Status: Inappropriate [oe-core specific]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop19323692019-04-05 15:28:33 -04009
Brad Bishopa5c52ff2018-11-23 10:55:50 +130010---
Patrick Williamse760df82023-05-26 11:10:49 -050011 mesonbuild/dependencies/python.py | 6 +-----
Patrick Williams03907ee2022-05-01 06:28:52 -050012 1 file changed, 1 insertion(+), 5 deletions(-)
Brad Bishopa5c52ff2018-11-23 10:55:50 +130013
Patrick Williamse760df82023-05-26 11:10:49 -050014diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
Patrick Williams705982a2024-01-12 09:51:57 -060015index 9aea6bd..8c13ede 100644
Patrick Williamse760df82023-05-26 11:10:49 -050016--- a/mesonbuild/dependencies/python.py
17+++ b/mesonbuild/dependencies/python.py
Patrick Williams705982a2024-01-12 09:51:57 -060018@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
Patrick Williamse760df82023-05-26 11:10:49 -050019 empty.name = 'python'
20 return empty
Patrick Williams03907ee2022-05-01 06:28:52 -050021
Patrick Williamse760df82023-05-26 11:10:49 -050022- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None)
23- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None)
24- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
25 try:
26 return PythonPkgConfigDependency(name, env, kwargs, installation, True)
27 finally:
Patrick Williams705982a2024-01-12 09:51:57 -060028@@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
Patrick Williamse760df82023-05-26 11:10:49 -050029 os.environ[name] = value
30 elif name in os.environ:
31 del os.environ[name]
32- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir)
33- set_env('PKG_CONFIG_PATH', old_pkg_path)
34+ pass
Brad Bishopa5c52ff2018-11-23 10:55:50 +130035
Patrick Williamse760df82023-05-26 11:10:49 -050036 candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation))
37 # We only need to check both, if a python install has a LIBPC. It might point to the wrong location,