From 62ea5c31be4a1a5eaba83f81d09b36553febb647 Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Fri, 6 Sep 2019 10:03:46 +0800 Subject: meson:upgrade 0.51.1 -> 0.51.2 -meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch Removed since this is included in 0.51.2. Signed-off-by: Zang Ruochen Signed-off-by: Ross Burton --- meta/recipes-devtools/meson/meson.inc | 5 +- ...-return-statements-that-are-seen-with-Wer.patch | 100 --------------------- meta/recipes-devtools/meson/meson_0.51.1.bb | 4 - meta/recipes-devtools/meson/meson_0.51.2.bb | 4 + .../meson/nativesdk-meson_0.51.1.bb | 66 -------------- .../meson/nativesdk-meson_0.51.2.bb | 66 ++++++++++++++ 6 files changed, 72 insertions(+), 173 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch delete mode 100644 meta/recipes-devtools/meson/meson_0.51.1.bb create mode 100644 meta/recipes-devtools/meson/meson_0.51.2.bb delete mode 100644 meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb create mode 100644 meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 14e5f8a610..6de109de7f 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -16,10 +16,9 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://vala-cross-compile.patch \ - file://0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch \ " -SRC_URI[sha256sum] = "f27b7a60f339ba66fe4b8f81f0d1072e090a08eabbd6aa287683b2c2b9dd2d82" -SRC_URI[md5sum] = "48787e391ec5c052799a3dd491f73909" +SRC_URI[sha256sum] = "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76" +SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch b/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch deleted file mode 100644 index 16c6d90761..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 15f44be1c7f71cb0a8c6863917acbbc301c621fe Mon Sep 17 00:00:00 2001 -From: Martin Liska -Date: Mon, 15 Jul 2019 10:06:17 +0200 -Subject: [PATCH] Fix missing return statements that are seen with - -Werror=return-type. - -Error example: - -Code: - - #include - int main () { - /* If it's not defined as a macro, try to use as a symbol */ - #ifndef LC_MESSAGES - LC_MESSAGES; - #endif - } -Compiler stdout: - -Compiler stderr: - In file included from /usr/include/locale.h:25, - from /tmp/tmpep_i4iwg/testfile.c:2: -/usr/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE -requires compiling with optimization (-O) [-Wcpp] - 382 | # warning _FORTIFY_SOURCE requires compiling with optimization -(-O) - | ^~~~~~~ -/tmp/tmpep_i4iwg/testfile.c: In function 'main': -/tmp/tmpep_i4iwg/testfile.c:8:9: error: control reaches end of non-void -function [-Werror=return-type] - 8 | } - | ^ -cc1: some warnings being treated as errors - -Upstream-Status: Backport -Signed-off-by: Martin Jansa ---- - mesonbuild/compilers/c.py | 1 + - mesonbuild/compilers/clike.py | 5 +++++ - 2 files changed, 6 insertions(+) - -diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py -index 3b58a076..9ef92077 100644 ---- a/mesonbuild/compilers/c.py -+++ b/mesonbuild/compilers/c.py -@@ -70,6 +70,7 @@ class CCompiler(CLikeCompiler, Compiler): - #ifndef {symbol} - {symbol}; - #endif -+ return 0; - }}''' - return self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies) -diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/clike.py -index 83f67591..f9cbeabd 100644 ---- a/mesonbuild/compilers/clike.py -+++ b/mesonbuild/compilers/clike.py -@@ -375,6 +375,7 @@ class CLikeCompiler: - #ifndef {symbol} - {symbol}; - #endif -+ return 0; - }}''' - return self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies) -@@ -554,6 +555,7 @@ class CLikeCompiler: - {prefix} - int main(int argc, char **argv) {{ - {type} something; -+ return 0; - }}''' - if not self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies)[0]: -@@ -589,6 +591,7 @@ class CLikeCompiler: - {prefix} - int main(int argc, char **argv) {{ - {type} something; -+ return 0; - }}''' - if not self.compiles(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies)[0]: -@@ -667,6 +670,7 @@ class CLikeCompiler: - #include - int main(int argc, char *argv[]) {{ - printf ("{fmt}", {cast} {f}()); -+ return 0; - }}'''.format(**fargs) - res = self.run(code, env, extra_args=extra_args, dependencies=dependencies) - if not res.compiled: -@@ -819,6 +823,7 @@ class CLikeCompiler: - #error "No definition for __builtin_{func} found in the prefix" - #endif - #endif -+ return 0; - }}''' - return self.links(t.format(**fargs), env, extra_args=extra_args, - dependencies=dependencies) --- -2.17.1 - diff --git a/meta/recipes-devtools/meson/meson_0.51.1.bb b/meta/recipes-devtools/meson/meson_0.51.1.bb deleted file mode 100644 index de9b905c12..0000000000 --- a/meta/recipes-devtools/meson/meson_0.51.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include meson.inc - -BBCLASSEXTEND = "native" - diff --git a/meta/recipes-devtools/meson/meson_0.51.2.bb b/meta/recipes-devtools/meson/meson_0.51.2.bb new file mode 100644 index 0000000000..de9b905c12 --- /dev/null +++ b/meta/recipes-devtools/meson/meson_0.51.2.bb @@ -0,0 +1,4 @@ +include meson.inc + +BBCLASSEXTEND = "native" + diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb deleted file mode 100644 index 1756f342ce..0000000000 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb +++ /dev/null @@ -1,66 +0,0 @@ -include meson.inc - -inherit nativesdk -inherit siteinfo - -SRC_URI += "file://meson-setup.py \ - file://meson-wrapper" - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) - -# The cross file logic is similar but not identical to that in meson.bbclass, -# since it's generating for an SDK rather than a cross-compile. Important -# differences are: -# - We can't set vars like CC, CXX, etc. yet because they will be filled in with -# real paths by meson-setup.sh when the SDK is extracted. -# - Some overrides aren't needed, since the SDK injects paths that take care of -# them. -do_install_append() { - install -d ${D}${datadir}/meson - cat >${D}${datadir}/meson/meson.cross.template <${D}${datadir}/meson/meson.cross.template <