diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-12-18 17:29:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-03 12:35:53 +0000 |
commit | 980f3d6bdf8db8bde389cd65e446969acee73202 (patch) | |
tree | 7e37a70afe40f0e34a9fcc53e31a45f0af23e775 /meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | |
parent | 86dabd1e3392a43ab24169bb6ff6f4948fb5947e (diff) | |
download | poky-980f3d6bdf8db8bde389cd65e446969acee73202.tar.gz |
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 <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 39 |
1 files changed, 39 insertions, 0 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 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 @@ | |||
1 | From d058d0f1d8833d99e8a3d3b9bcc383db23b52671 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 | ||
4 | Subject: [PATCH 1/2] Make CPU family warnings fatal | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | --- | ||
10 | mesonbuild/environment.py | 6 ++---- | ||
11 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | ||
14 | index 2ccd31e..5fcf9df 100644 | ||
15 | --- a/mesonbuild/environment.py | ||
16 | +++ b/mesonbuild/environment.py | ||
17 | @@ -265,9 +265,7 @@ def detect_cpu_family(compilers): | ||
18 | # below. | ||
19 | |||
20 | if trial not in known_cpu_families: | ||
21 | - mlog.warning('Unknown CPU family {!r}, please report this at ' | ||
22 | - 'https://github.com/mesonbuild/meson/issues/new with the' | ||
23 | - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) | ||
24 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) | ||
25 | |||
26 | return trial | ||
27 | |||
28 | @@ -1232,7 +1230,7 @@ class MachineInfo: | ||
29 | |||
30 | cpu_family = literal['cpu_family'] | ||
31 | if cpu_family not in known_cpu_families: | ||
32 | - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family) | ||
33 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family) | ||
34 | |||
35 | endian = literal['endian'] | ||
36 | if endian not in ('little', 'big'): | ||
37 | -- | ||
38 | 2.17.1 | ||
39 | |||