aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-09-06 10:03:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 14:56:05 +0100
commit62ea5c31be4a1a5eaba83f81d09b36553febb647 (patch)
tree8da8db00843d60c152b97eea83dc8c9950231931
parent1b0ce3ec1d3254afa2cf3ac7ecfd736124d711cc (diff)
downloadopenembedded-core-contrib-62ea5c31be4a1a5eaba83f81d09b36553febb647.tar.gz
openembedded-core-contrib-62ea5c31be4a1a5eaba83f81d09b36553febb647.tar.bz2
openembedded-core-contrib-62ea5c31be4a1a5eaba83f81d09b36553febb647.zip
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 <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/meson/meson.inc5
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch100
-rw-r--r--meta/recipes-devtools/meson/meson_0.51.2.bb (renamed from meta/recipes-devtools/meson/meson_0.51.1.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb)0
4 files changed, 2 insertions, 103 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 14e5f8a6108..6de109de7fd 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 16c6d90761d..00000000000
--- 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 <mliska@suse.cz>
-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 <locale.h>
- 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 <Martin.Jansa@gmail.com>
----
- 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 <stdio.h>
- 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.2.bb
index de9b905c12b..de9b905c12b 100644
--- a/meta/recipes-devtools/meson/meson_0.51.1.bb
+++ b/meta/recipes-devtools/meson/meson_0.51.2.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
index 1756f342ce3..1756f342ce3 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.51.1.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb