summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-04-08 08:51:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-10 11:05:34 +0100
commit9bde1176c1d66024e51fd1d19d31c7bbdbdbd012 (patch)
tree7fd3acff153b9e084ff1dbf82e84400ff71f1f28 /meta
parent9f238203e58ea162fdff16b33437d3248e4d0683 (diff)
downloadpoky-9bde1176c1d66024e51fd1d19d31c7bbdbdbd012.tar.gz
meson: upgrade 1.7.1 -> 1.7.2
0001-Make-CPU-family-warnings-fatal.patch refreshed for 1.7.2 (From OE-Core rev: b8c15494900cdacfdcfa18526b8ad33cb9ce5ee3) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch10
-rw-r--r--meta/recipes-devtools/meson/meson_1.7.2.bb (renamed from meta/recipes-devtools/meson/meson_1.7.1.bb)2
2 files changed, 6 insertions, 6 deletions
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 dcc8209c31..ca2bcef1ee 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 32c4ccfbdc8649f595a79e7fd1bd39d6f8325340 Mon Sep 17 00:00:00 2001 1From 8ba2c1f596206d45e8f14d4f4d2439023a3de9e7 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
@@ -11,10 +11,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
11 2 files changed, 4 insertions(+), 6 deletions(-) 11 2 files changed, 4 insertions(+), 6 deletions(-)
12 12
13diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 13diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
14index 86bad9b..9703315 100644 14index 6726d4e..844b611 100644
15--- a/mesonbuild/envconfig.py 15--- a/mesonbuild/envconfig.py
16+++ b/mesonbuild/envconfig.py 16+++ b/mesonbuild/envconfig.py
17@@ -277,8 +277,8 @@ class MachineInfo(HoldableObject): 17@@ -278,8 +278,8 @@ class MachineInfo(HoldableObject):
18 'but is missing {}.'.format(minimum_literal - set(literal))) 18 'but is missing {}.'.format(minimum_literal - set(literal)))
19 19
20 cpu_family = literal['cpu_family'] 20 cpu_family = literal['cpu_family']
@@ -26,10 +26,10 @@ index 86bad9b..9703315 100644
26 endian = literal['endian'] 26 endian = literal['endian']
27 if endian not in ('little', 'big'): 27 if endian not in ('little', 'big'):
28diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 28diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
29index 71a2f3a..4cbeabe 100644 29index 386316e..b4a0d88 100644
30--- a/mesonbuild/environment.py 30--- a/mesonbuild/environment.py
31+++ b/mesonbuild/environment.py 31+++ b/mesonbuild/environment.py
32@@ -416,10 +416,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: 32@@ -419,10 +419,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
33 if compilers and not any_compiler_has_define(compilers, '__mips64'): 33 if compilers and not any_compiler_has_define(compilers, '__mips64'):
34 trial = 'mips' 34 trial = 'mips'
35 35
diff --git a/meta/recipes-devtools/meson/meson_1.7.1.bb b/meta/recipes-devtools/meson/meson_1.7.2.bb
index d83a5efbf5..45a74612ce 100644
--- a/meta/recipes-devtools/meson/meson_1.7.1.bb
+++ b/meta/recipes-devtools/meson/meson_1.7.2.bb
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
15 file://0001-Make-CPU-family-warnings-fatal.patch \ 15 file://0001-Make-CPU-family-warnings-fatal.patch \
16 file://0002-Support-building-allarch-recipes-again.patch \ 16 file://0002-Support-building-allarch-recipes-again.patch \
17 " 17 "
18SRC_URI[sha256sum] = "155780a5be87f6dd7f427ad8bcbf0f2b2c5f62ee5fdacca7caa9de8439a24b89" 18SRC_URI[sha256sum] = "4d40d63aa748a9c139cc41ab9bffe43edd113c5639d78bde81544ca955aea890"
19UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" 19UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$"
20 20
21inherit python_setuptools_build_meta github-releases 21inherit python_setuptools_build_meta github-releases