blob: fdadc6869ba8d7f6cfd12832c8b610dd419b6113 [file] [log] [blame]
William A. Kennington IIIac69b482021-06-02 12:28:27 -07001From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 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---
Brad Bishop19323692019-04-05 15:28:33 -040011 mesonbuild/modules/python.py | 12 ------------
12 1 file changed, 12 deletions(-)
Brad Bishopa5c52ff2018-11-23 10:55:50 +130013
14diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
William A. Kennington IIIac69b482021-06-02 12:28:27 -070015index 422155b..aaf5844 100644
Brad Bishopa5c52ff2018-11-23 10:55:50 +130016--- a/mesonbuild/modules/python.py
17+++ b/mesonbuild/modules/python.py
William A. Kennington IIIac69b482021-06-02 12:28:27 -070018@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
Brad Bishop19323692019-04-05 15:28:33 -040019 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
20 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
Brad Bishopa5c52ff2018-11-23 10:55:50 +130021
Brad Bishop19323692019-04-05 15:28:33 -040022- os.environ.pop('PKG_CONFIG_PATH', None)
Brad Bishopa5c52ff2018-11-23 10:55:50 +130023-
Brad Bishop19323692019-04-05 15:28:33 -040024- if pkg_libdir:
25- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
26-
27 try:
William A. Kennington IIIc5966302020-03-20 13:04:31 -070028 self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
William A. Kennington IIIac69b482021-06-02 12:28:27 -070029 mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
30@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
31 mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
Brad Bishop19323692019-04-05 15:28:33 -040032 mlog.debug(e)
Brad Bishopa5c52ff2018-11-23 10:55:50 +130033
Brad Bishop19323692019-04-05 15:28:33 -040034- if old_pkg_path is not None:
35- os.environ['PKG_CONFIG_PATH'] = old_pkg_path
36-
37- if old_pkg_libdir is not None:
38- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir
39- else:
40- os.environ.pop('PKG_CONFIG_LIBDIR', None)
41 else:
William A. Kennington IIIac69b482021-06-02 12:28:27 -070042 mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
Brad Bishop19323692019-04-05 15:28:33 -040043