From 4821e629efe0ec86cef32d326c2fc5ab6515d2f6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 24 Jan 2020 11:17:20 +0100 Subject: 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 Signed-off-by: Richard Purdie --- ...n-module-do-not-manipulate-the-environment-when.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch') 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 @@ -From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 12 deletions(-) diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 9cfbd6f..3ff687a 100644 +index 07be318..b770603 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py -@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency): +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency): old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') old_pkg_path = os.environ.get('PKG_CONFIG_PATH') @@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644 - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir - try: - self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) - mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) -@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency): - mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) + self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs) + mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir)) +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency): + mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir)) mlog.debug(e) - if old_pkg_path is not None: @@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644 - else: - os.environ.pop('PKG_CONFIG_LIBDIR', None) else: - mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) + mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir)) -- cgit v1.2.3-54-g00ecf