summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-02-19 18:46:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-20 11:30:26 +0000
commit0cc5265d108fd632db9dd751454325fe6e86a62f (patch)
tree30c660e1234a2cb333dbcb9a0e69d3fd94eb12dc
parent9e2e7e9a475d92cdf512f95389f1b5e89e75e998 (diff)
downloadopenembedded-core-contrib-0cc5265d108fd632db9dd751454325fe6e86a62f.tar.gz
openembedded-core-contrib-0cc5265d108fd632db9dd751454325fe6e86a62f.tar.bz2
openembedded-core-contrib-0cc5265d108fd632db9dd751454325fe6e86a62f.zip
meson: upgrade 0.49.0 -> 0.49.2
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/meson/meson.inc4
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch7
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch7
-rw-r--r--meta/recipes-devtools/meson/meson_0.49.2.bb (renamed from meta/recipes-devtools/meson/meson_0.49.0.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.49.2.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb)0
5 files changed, 6 insertions, 12 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index c39b1a3d5e..d5d71c67b6 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,8 +15,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-modules-windows-split-WINDRES-env-variable.patch \
file://0002-environment.py-detect-windows-also-if-the-system-str.patch \
"
-SRC_URI[sha256sum] = "fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551"
-SRC_URI[md5sum] = "3c35b91e8040901034809576d54007c6"
+SRC_URI[sha256sum] = "ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd"
+SRC_URI[md5sum] = "0267b0871266056184c484792572c682"
SRC_URI_append_class-native = " \
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 785c0f027b..fbc3f5ad82 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,7 +1,7 @@
-From d058d0f1d8833d99e8a3d3b9bcc383db23b52671 Mon Sep 17 00:00:00 2001
+From 2db829d865bb6464ac15dbb4a58c9a675e296866 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 1/2] Make CPU family warnings fatal
+Subject: [PATCH] Make CPU family warnings fatal
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Ross Burton <ross.burton@intel.com>
@@ -34,6 +34,3 @@ index 2ccd31e..5fcf9df 100644
endian = literal['endian']
if endian not in ('little', 'big'):
---
-2.17.1
-
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 e7ba40701f..81548cdfb8 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,7 +1,7 @@
-From ffab5c5046da29fc20b074d21f6de46520cee58c Mon Sep 17 00:00:00 2001
+From f8419d5f279f1fb9b5e7eead4f1579bce7cb0e4e Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
-Subject: [PATCH 2/2] Support building allarch recipes again
+Subject: [PATCH] Support building allarch recipes again
This registers "allarch" as a known CPU family.
@@ -24,6 +24,3 @@ index 5fcf9df..b4fc0dc 100644
'aarch64',
'arc',
'arm',
---
-2.17.1
-
diff --git a/meta/recipes-devtools/meson/meson_0.49.0.bb b/meta/recipes-devtools/meson/meson_0.49.2.bb
index de9b905c12..de9b905c12 100644
--- a/meta/recipes-devtools/meson/meson_0.49.0.bb
+++ b/meta/recipes-devtools/meson/meson_0.49.2.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.49.2.bb
index 1549357a55..1549357a55 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.49.2.bb