summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
diff options
context:
space:
mode:
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.patch14
1 files changed, 7 insertions, 7 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 eb0e90dbdd..fdadc6869b 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 @@
1From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001 1From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 19 Nov 2018 14:24:26 +0100 3Date: Mon, 19 Nov 2018 14:24:26 +0100
4Subject: [PATCH] python module: do not manipulate the environment when calling 4Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 1 file changed, 12 deletions(-) 12 1 file changed, 12 deletions(-)
13 13
14diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py 14diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
15index 07be318..b770603 100644 15index 422155b..aaf5844 100644
16--- a/mesonbuild/modules/python.py 16--- a/mesonbuild/modules/python.py
17+++ b/mesonbuild/modules/python.py 17+++ b/mesonbuild/modules/python.py
18@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency): 18@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
19 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') 19 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
20 old_pkg_path = os.environ.get('PKG_CONFIG_PATH') 20 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
21 21
@@ -26,9 +26,9 @@ index 07be318..b770603 100644
26- 26-
27 try: 27 try:
28 self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs) 28 self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
29 mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir)) 29 mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
30@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency): 30@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
31 mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir)) 31 mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
32 mlog.debug(e) 32 mlog.debug(e)
33 33
34- if old_pkg_path is not None: 34- if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 07be318..b770603 100644
39- else: 39- else:
40- os.environ.pop('PKG_CONFIG_LIBDIR', None) 40- os.environ.pop('PKG_CONFIG_LIBDIR', None)
41 else: 41 else:
42 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir)) 42 mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
43 43