From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 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 | 12 ------------
|
1 file changed, 12 deletions(-)
|
|
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
|
index 422155b..aaf5844 100644
|
--- a/mesonbuild/modules/python.py
|
+++ b/mesonbuild/modules/python.py
|
@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
|
old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
|
old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
|
|
- os.environ.pop('PKG_CONFIG_PATH', None)
|
-
|
- if pkg_libdir:
|
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
|
-
|
try:
|
self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
|
mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
|
@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
|
mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
|
mlog.debug(e)
|
|
- if old_pkg_path is not None:
|
- os.environ['PKG_CONFIG_PATH'] = old_pkg_path
|
-
|
- if old_pkg_libdir is not None:
|
- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir
|
- else:
|
- os.environ.pop('PKG_CONFIG_LIBDIR', None)
|
else:
|
mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
|
|
