Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame^] | 1 | From 45426f06689a520fc47f81ee29b49d509f11ba58 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 |
| 4 | Subject: [PATCH] python module: do not manipulate the environment when calling |
| 5 | pkg-config |
| 6 | |
| 7 | Upstream-Status: Inappropriate [oe-core specific] |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 9 | --- |
| 10 | mesonbuild/modules/python.py | 14 -------------- |
| 11 | 1 file changed, 14 deletions(-) |
| 12 | |
| 13 | diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py |
| 14 | index 1195d8a..df81da4 100644 |
| 15 | --- a/mesonbuild/modules/python.py |
| 16 | +++ b/mesonbuild/modules/python.py |
| 17 | @@ -67,26 +67,12 @@ class PythonDependency(ExternalDependency): |
| 18 | if DependencyMethods.PKGCONFIG in self.methods and not python_holder.is_pypy: |
| 19 | pkg_version = self.variables.get('LDVERSION') or self.version |
| 20 | pkg_libdir = self.variables.get('LIBPC') |
| 21 | - old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') |
| 22 | - old_pkg_path = os.environ.get('PKG_CONFIG_PATH') |
| 23 | - |
| 24 | - os.environ.pop('PKG_CONFIG_PATH', None) |
| 25 | - |
| 26 | - if pkg_libdir: |
| 27 | - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir |
| 28 | |
| 29 | try: |
| 30 | self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) |
| 31 | except Exception: |
| 32 | pass |
| 33 | |
| 34 | - 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 | |
| 42 | if self.pkgdep and self.pkgdep.found(): |
| 43 | self.compile_args = self.pkgdep.get_compile_args() |