mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
meson: upgrade 0.53.0 -> 0.53.1
(From OE-Core rev: c94ae81f9ebf9d4d3546a86e097cdba51b3468b0) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
084f767a3d
commit
97a6f7ad7c
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
|
||||
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
|
||||
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
|
||||
SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
|
||||
SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04"
|
||||
SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2"
|
||||
|
||||
SRC_URI_append_class-native = " \
|
||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
|
||||
From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Tue, 3 Jul 2018 13:59:09 +0100
|
||||
Subject: [PATCH] Make CPU family warnings fatal
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
|
||||
From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001
|
||||
From: Peter Kjellerstedt <pkj@axis.com>
|
||||
Date: Thu, 26 Jul 2018 16:32:49 +0200
|
||||
Subject: [PATCH] Support building allarch recipes again
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
|
||||
From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001
|
||||
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
|
||||
Date: Wed, 15 Nov 2017 15:05:01 +0100
|
||||
Subject: [PATCH] native_bindir
|
||||
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
|
||||
2 files changed, 14 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
|
||||
index f17b9f2..b5c9c92 100644
|
||||
index 40e304c..4b687df 100644
|
||||
--- a/mesonbuild/dependencies/base.py
|
||||
+++ b/mesonbuild/dependencies/base.py
|
||||
@@ -184,7 +184,7 @@ class Dependency:
|
||||
@@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644
|
||||
+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
|
||||
return cache[(self.pkgbin, targs, fenv)]
|
||||
|
||||
def _convert_mingw_paths(self, args: List[str]) -> List[str]:
|
||||
def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
|
||||
@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
|
||||
(self.name, out_raw))
|
||||
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
|
||||
@@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644
|
||||
if ret != 0:
|
||||
if self.required:
|
||||
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
|
||||
index bdcc4a7..e2de847 100644
|
||||
index da411ef..856506a 100644
|
||||
--- a/mesonbuild/dependencies/ui.py
|
||||
+++ b/mesonbuild/dependencies/ui.py
|
||||
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
|
||||
@@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644
|
||||
if prefix:
|
||||
self.bindir = os.path.join(prefix, 'bin')
|
||||
|
||||
@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency):
|
||||
@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency):
|
||||
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
|
||||
for application in applications:
|
||||
try:
|
||||
@@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644
|
||||
except MesonException:
|
||||
pass
|
||||
|
||||
@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency):
|
||||
@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency):
|
||||
QtBaseDependency.__init__(self, 'qt5', env, kwargs)
|
||||
|
||||
def get_pkgconfig_host_bins(self, core):
|
||||
|
||||
Reference in New Issue
Block a user