From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 --- mesonbuild/modules/python.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 07be318..b770603 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -71,11 +71,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('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir)) @@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency): mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, 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('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))