summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-09-25 14:48:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-30 17:00:51 +0100
commitcb82bbbbc01a5b4fdc73d91f236a9ba2476e0c82 (patch)
tree696a646b5503fc966b8189e734711872874f7750
parent629b55244e6d4fb2791eafdef78d10f8f6e09648 (diff)
downloadpoky-cb82bbbbc01a5b4fdc73d91f236a9ba2476e0c82.tar.gz
meson: upgrade 1.5.1 -> 1.5.2
0001-Make-CPU-family-warnings-fatal.patch refreshed for 1.5.2 Changelog: ============ - nasm: Use different test sources for x86 and x86_64 - mdist: correctly detect dirty hg repos with non-English locale, redux - backend/ninja: Generate sysroot in rust-project.json - mdist: detect pathological git repo cases and show a slightly better error - compilers: Pass mode to determine_args, not its string value - CI: mark arch as skipping frameworks/libgcrypt - When configuring fails in Github Actions, print folded logs - Prevent raw exception during project() - compilers: avoid -Wunused-value compiler warning in CLikeCompiler.has_type() - compilers: avoid -Wunused-value compiler warning in CLikeCompiler.has_members() - mformat: better handling of continuation lines - mformat: detect invalid config - tests: handle uncommon architecture format for nm - mformat: regenerate long lines even if they're already multiline - Add support for LLVM 19 in Debian. - mformat: provide nice error message instead of backtrace for invalid value - mformat: A triple string with a ' in it cannot be simplified - tests/format: Make the compare script more useful - linkers: skip -export_dynamic flag before MacOS 10.7 - format: fix indentation of comments - mformat: correctly handle editorconfig files without the root setting - cargo: Ignore Cargo.lock if toml implementation is missing - compilers: do not strip '-isystem' from C build arguments - Fix compiling ObjC/ObjC++ on Windows/MinGW - mformat: fix formatting of empty build file - tests: nasm: make it easier to debug generator() style build - mdist: correctly detect dirty hg repos with non-English locale (From OE-Core rev: 292b015bae6fdd11f086dc30f385f45ef2f0eb8d) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch6
-rw-r--r--meta/recipes-devtools/meson/meson_1.5.2.bb (renamed from meta/recipes-devtools/meson/meson_1.5.1.bb)2
2 files changed, 4 insertions, 4 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 04abb8b314..b272fd45b0 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 33bc81d5a262e0fa1a346ac1667a3679a17c0997 Mon Sep 17 00:00:00 2001 1From 13e05ca933a572c1caf93372df808a30976f99cd 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
@@ -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 5bccb90..6aa4b15 100644 29index 484ef45..cf4a3ba 100644
30--- a/mesonbuild/environment.py 30--- a/mesonbuild/environment.py
31+++ b/mesonbuild/environment.py 31+++ b/mesonbuild/environment.py
32@@ -387,10 +387,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: 32@@ -389,10 +389,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.5.1.bb b/meta/recipes-devtools/meson/meson_1.5.2.bb
index 4f68a22fa9..beb1751e6f 100644
--- a/meta/recipes-devtools/meson/meson_1.5.1.bb
+++ b/meta/recipes-devtools/meson/meson_1.5.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] = "567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed" 18SRC_URI[sha256sum] = "f955e09ab0d71ef180ae85df65991d58ed8430323de7d77a37e11c9ea630910b"
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