diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index 6072985404..bf715d1e9f 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 45426f06689a520fc47f81ee29b49d509f11ba58 Mon Sep 17 00:00:00 2001 | 1 | From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 | 3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 |
4 | Subject: [PATCH] python module: do not manipulate the environment when calling | 4 | Subject: [PATCH] python module: do not manipulate the environment when calling |
@@ -6,38 +6,38 @@ Subject: [PATCH] python module: do not manipulate the environment when calling | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [oe-core specific] | 7 | Upstream-Status: Inappropriate [oe-core specific] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | mesonbuild/modules/python.py | 14 -------------- | 11 | mesonbuild/modules/python.py | 12 ------------ |
11 | 1 file changed, 14 deletions(-) | 12 | 1 file changed, 12 deletions(-) |
12 | 13 | ||
13 | diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py | 14 | diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py |
14 | index 1195d8a..df81da4 100644 | 15 | index 9cfbd6f..3ff687a 100644 |
15 | --- a/mesonbuild/modules/python.py | 16 | --- a/mesonbuild/modules/python.py |
16 | +++ b/mesonbuild/modules/python.py | 17 | +++ b/mesonbuild/modules/python.py |
17 | @@ -67,26 +67,12 @@ class PythonDependency(ExternalDependency): | 18 | @@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency): |
18 | if DependencyMethods.PKGCONFIG in self.methods and not python_holder.is_pypy: | 19 | old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') |
19 | pkg_version = self.variables.get('LDVERSION') or self.version | 20 | old_pkg_path = os.environ.get('PKG_CONFIG_PATH') |
20 | pkg_libdir = self.variables.get('LIBPC') | 21 | |
21 | - old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') | 22 | - os.environ.pop('PKG_CONFIG_PATH', None) |
22 | - old_pkg_path = os.environ.get('PKG_CONFIG_PATH') | ||
23 | - | 23 | - |
24 | - os.environ.pop('PKG_CONFIG_PATH', None) | 24 | - if pkg_libdir: |
25 | - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir | ||
25 | - | 26 | - |
26 | - if pkg_libdir: | 27 | try: |
27 | - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir | 28 | self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) |
28 | 29 | mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) | |
29 | try: | 30 | @@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency): |
30 | self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) | 31 | mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) |
31 | except Exception: | 32 | mlog.debug(e) |
32 | pass | ||
33 | 33 | ||
34 | - if old_pkg_path is not None: | 34 | - if old_pkg_path is not None: |
35 | - os.environ['PKG_CONFIG_PATH'] = old_pkg_path | 35 | - os.environ['PKG_CONFIG_PATH'] = old_pkg_path |
36 | - | 36 | - |
37 | - if old_pkg_libdir is not None: | 37 | - if old_pkg_libdir is not None: |
38 | - os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir | 38 | - os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir |
39 | - else: | 39 | - else: |
40 | - os.environ.pop('PKG_CONFIG_LIBDIR', None) | 40 | - os.environ.pop('PKG_CONFIG_LIBDIR', None) |
41 | else: | ||
42 | mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) | ||
41 | 43 | ||
42 | if self.pkgdep and self.pkgdep.found(): | ||
43 | self.compile_args = self.pkgdep.get_compile_args() | ||