summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-24 11:17:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 16:48:09 +0000
commit4821e629efe0ec86cef32d326c2fc5ab6515d2f6 (patch)
tree455761d449c96cd312e417fbfbeac06be77ea28d /meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
parent22dd46cc34629d0750177fddff2e1c178c854340 (diff)
downloadpoky-4821e629efe0ec86cef32d326c2fc5ab6515d2f6.tar.gz
meson: update 0.52.1 -> 0.53.0
Unset LD, and do not set ld in cross file from LD as new version of meson passes that value directly to -fuse-ld=... which requires one of lld, bfd, gold. (From OE-Core rev: e0e30637a139feb744ca284aa63d47efefc5cb5d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch16
1 files changed, 8 insertions, 8 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 bf715d1e9f..eb0e90dbdd 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 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 1From 689e28c49b85311f93f39df70cbee702fc44afb6 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 9cfbd6f..3ff687a 100644 15index 07be318..b770603 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@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency): 18@@ -71,11 +71,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
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
25- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir 25- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
26- 26-
27 try: 27 try:
28 self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) 28 self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
29 mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) 29 mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
30@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency): 30@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
31 mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) 31 mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, 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 9cfbd6f..3ff687a 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('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) 42 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
43 43