summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-05-08 15:54:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-09 16:31:56 +0100
commit9ddc7aa0635632b839d2ed6c4d7a282f5c73408e (patch)
treeea7c29d4ecfe4791052f2be051412903ae87adc0 /meta/recipes-devtools/meson
parent796b9089c589fed1412ae85b0fd6e33a41cba234 (diff)
downloadpoky-9ddc7aa0635632b839d2ed6c4d7a282f5c73408e.tar.gz
meson: update to 0.50.1
None of the backported patches actually made it into this release. (From OE-Core rev: a443a765944797b2a62935fc7ea3a2dd827e3b1a) 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')
-rw-r--r--meta/recipes-devtools/meson/meson.inc4
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch2
-rw-r--r--meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch12
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch2
-rw-r--r--meta/recipes-devtools/meson/meson_0.50.1.bb (renamed from meta/recipes-devtools/meson/meson_0.50.0.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.50.1.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.50.0.bb)0
6 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 21d34da6ad..6a723683cc 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -18,8 +18,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
18 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ 18 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
19 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 19 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
20 " 20 "
21SRC_URI[sha256sum] = "2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f" 21SRC_URI[sha256sum] = "f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc"
22SRC_URI[md5sum] = "433483107fda4616eaf33de7e7083a84" 22SRC_URI[md5sum] = "24a6527796115828d2ebc75880e18d62"
23 23
24SRC_URI_append_class-native = " \ 24SRC_URI_append_class-native = " \
25 file://0001-Make-CPU-family-warnings-fatal.patch \ 25 file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index 9e90b72f31..adde1e271f 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
1From 1ec44c955f45f3787aaf92edd70dec5bcf03f665 Mon Sep 17 00:00:00 2001 1From 4b4b3d4932d928f05dbd74d730a3c8a5ac371e1d Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100 3Date: Tue, 3 Jul 2018 13:59:09 +0100
4Subject: [PATCH] Make CPU family warnings fatal 4Subject: [PATCH] Make CPU family warnings fatal
diff --git a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
index e64e13b836..8334714541 100644
--- a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
+++ b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
@@ -1,4 +1,4 @@
1From c040f0dbace3259c80f3710bc019433b9c817940 Mon Sep 17 00:00:00 2001 1From d9da5e7a16a9397e22a8900fac4b60b40d7f00de Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 25 Mar 2019 18:18:33 +0100 3Date: Mon, 25 Mar 2019 18:18:33 +0100
4Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build 4Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build
@@ -8,23 +8,21 @@ This can, and does, go wrong when our host architecture is same as the target on
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
11--- 12---
12 mesonbuild/environment.py | 2 +- 13 mesonbuild/environment.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
14 15
15diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 16diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
16index 4c1c5ac..6e5d689 100644 17index d4f0630..c584fa4 100644
17--- a/mesonbuild/environment.py 18--- a/mesonbuild/environment.py
18+++ b/mesonbuild/environment.py 19+++ b/mesonbuild/environment.py
19@@ -478,7 +478,7 @@ class Environment: 20@@ -483,7 +483,7 @@ class Environment:
20 self.first_invocation = True 21 self.first_invocation = True
21 22
22 def is_cross_build(self): 23 def is_cross_build(self):
23- return not self.machines.matches_build_machine(MachineChoice.HOST) 24- return self.coredata.cross_file is not None
24+ return self.need_exe_wrapper() 25+ return self.need_exe_wrapper()
25 26
26 def dump_coredata(self): 27 def dump_coredata(self):
27 return coredata.save(self.coredata, self.get_build_dir()) 28 return coredata.save(self.coredata, self.get_build_dir())
28--
292.17.1
30
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index 323e21d8f6..e47e555324 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,4 +1,4 @@
1From a4bce582c1f13f48b329526aa81710405c4c691e Mon Sep 17 00:00:00 2001 1From 2164655328ec4e47335fc9033813274365491ad8 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com> 2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Thu, 26 Jul 2018 16:32:49 +0200 3Date: Thu, 26 Jul 2018 16:32:49 +0200
4Subject: [PATCH] Support building allarch recipes again 4Subject: [PATCH] Support building allarch recipes again
diff --git a/meta/recipes-devtools/meson/meson_0.50.0.bb b/meta/recipes-devtools/meson/meson_0.50.1.bb
index de9b905c12..de9b905c12 100644
--- a/meta/recipes-devtools/meson/meson_0.50.0.bb
+++ b/meta/recipes-devtools/meson/meson_0.50.1.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.50.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.50.1.bb
index 1549357a55..1549357a55 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.50.0.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.50.1.bb