diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-01-20 15:40:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-20 22:46:18 +0000 |
commit | 2c1db1849edb0ca3e51079776a71e8d49d3184b3 (patch) | |
tree | 9fb4e28fdd25b933ab082889b4166cb454055a3f /meta | |
parent | 056c8c383be2407c0a6ebb7b0a49966b5c07d8be (diff) | |
download | poky-2c1db1849edb0ca3e51079776a71e8d49d3184b3.tar.gz |
meson: upgrade 0.56.0 -> 0.56.2
(From OE-Core rev: 53a56bd497451552256fec335e9b241dcba16a1a)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/meson/meson.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson_0.56.2.bb (renamed from meta/recipes-devtools/meson/meson_0.56.0.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 2d3adbdb1a..d0ebec9911 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc | |||
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P | |||
16 | file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ | 16 | file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ |
17 | file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ | 17 | file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213" | 19 | SRC_URI[sha256sum] = "3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4" |
20 | 20 | ||
21 | SRC_URI_append_class-native = " \ | 21 | SRC_URI_append_class-native = " \ |
22 | file://0001-Make-CPU-family-warnings-fatal.patch \ | 22 | 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 86edcb5241..edd262df5a 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 @@ | |||
1 | From 110a525e5ebed2fca138d72da493c39510311c1f Mon Sep 17 00:00:00 2001 | 1 | From 248d17b7221e7ebc9d84154eac11ae4ebb5189ab Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 | 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
4 | Subject: [PATCH] Make CPU family warnings fatal | 4 | Subject: [PATCH] Make CPU family warnings fatal |
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 2d804740ad..2bbd2c149c 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 @@ | |||
1 | From 38f59e256f760aa959c13f4c5713f87ff7addee5 Mon Sep 17 00:00:00 2001 | 1 | From 3c0d3d1a32d4a66aa0b7ab9af3e975243855a1db Mon Sep 17 00:00:00 2001 |
2 | From: Peter Kjellerstedt <pkj@axis.com> | 2 | From: Peter Kjellerstedt <pkj@axis.com> |
3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 | 3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 |
4 | Subject: [PATCH] Support building allarch recipes again | 4 | Subject: [PATCH] Support building allarch recipes again |
@@ -13,10 +13,10 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | |||
13 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
14 | 14 | ||
15 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 15 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
16 | index d1be65b..90f3573 100644 | 16 | index 5ba3a1a..0bf4969 100644 |
17 | --- a/mesonbuild/envconfig.py | 17 | --- a/mesonbuild/envconfig.py |
18 | +++ b/mesonbuild/envconfig.py | 18 | +++ b/mesonbuild/envconfig.py |
19 | @@ -36,6 +36,7 @@ _T = T.TypeVar('_T') | 19 | @@ -38,6 +38,7 @@ _T = T.TypeVar('_T') |
20 | 20 | ||
21 | 21 | ||
22 | known_cpu_families = ( | 22 | known_cpu_families = ( |
diff --git a/meta/recipes-devtools/meson/meson_0.56.0.bb b/meta/recipes-devtools/meson/meson_0.56.2.bb index de9b905c12..de9b905c12 100644 --- a/meta/recipes-devtools/meson/meson_0.56.0.bb +++ b/meta/recipes-devtools/meson/meson_0.56.2.bb | |||
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb index 7fdc4c86d9..7fdc4c86d9 100644 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb | |||