mirror of
https://git.yoctoproject.org/poky
synced 2026-03-29 14:02:22 +02:00
e1691b1c84
(From OE-Core rev: 687234cbac01608053c14cbab0fba6eecbba1b91) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From dd5b4a200cd2fdf7fef627c4b6752f90c00b863a Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Mon, 19 Nov 2018 14:24:26 +0100
|
|
Subject: [PATCH] python module: do not manipulate the environment when calling
|
|
pkg-config
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
|
---
|
|
mesonbuild/modules/python.py | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
|
|
index f479ab9..b934bc6 100644
|
|
--- a/mesonbuild/modules/python.py
|
|
+++ b/mesonbuild/modules/python.py
|
|
@@ -239,10 +239,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
|
|
# If python-X.Y.pc exists in LIBPC, we will try to use it
|
|
def wrap_in_pythons_pc_dir(name: str, env: 'Environment', kwargs: T.Dict[str, T.Any],
|
|
installation: 'PythonInstallation') -> 'ExternalDependency':
|
|
- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None)
|
|
- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None)
|
|
- if pkg_libdir:
|
|
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
|
|
try:
|
|
return PythonPkgConfigDependency(name, env, kwargs, installation)
|
|
finally:
|
|
@@ -251,8 +247,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
|
|
os.environ[name] = value
|
|
elif name in os.environ:
|
|
del os.environ[name]
|
|
- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir)
|
|
- set_env('PKG_CONFIG_PATH', old_pkg_path)
|
|
+ pass
|
|
|
|
candidates.extend([
|
|
functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation),
|