From 980f3d6bdf8db8bde389cd65e446969acee73202 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Dec 2018 17:29:54 +0100 Subject: meson: update to 0.49.0 Drop upstreamed gi-flags.patch and gtkdoc-flags.patch, rebase the rest. (From OE-Core rev: 6cc5c57c38d2da37b4f15dea6e1fb97e3a0bae73) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-Make-CPU-family-warnings-fatal.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch (limited to 'meta/recipes-devtools/meson/meson/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 new file mode 100644 index 0000000000..785c0f027b --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -0,0 +1,39 @@ +From d058d0f1d8833d99e8a3d3b9bcc383db23b52671 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 3 Jul 2018 13:59:09 +0100 +Subject: [PATCH 1/2] Make CPU family warnings fatal + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Ross Burton + +--- + mesonbuild/environment.py | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 2ccd31e..5fcf9df 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -265,9 +265,7 @@ def detect_cpu_family(compilers): + # below. + + if trial not in known_cpu_families: +- mlog.warning('Unknown CPU family {!r}, please report this at ' +- 'https://github.com/mesonbuild/meson/issues/new with the' +- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) ++ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) + + return trial + +@@ -1232,7 +1230,7 @@ class MachineInfo: + + cpu_family = literal['cpu_family'] + if cpu_family not in known_cpu_families: +- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family) ++ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family) + + endian = literal['endian'] + if endian not in ('little', 'big'): +-- +2.17.1 + -- cgit v1.2.3-54-g00ecf