summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/meson')
-rw-r--r--meta/recipes-devtools/meson/meson.inc1
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch4
-rw-r--r--meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch38
3 files changed, 2 insertions, 41 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index e7f999a205..cfb831b106 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -10,7 +10,6 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
10 file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ 10 file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
11 file://0003-native_bindir.patch \ 11 file://0003-native_bindir.patch \
12 file://0002-Make-CPU-family-warnings-fatal.patch \ 12 file://0002-Make-CPU-family-warnings-fatal.patch \
13 file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch \
14 file://0001-Support-building-allarch-recipes-again.patch \ 13 file://0001-Support-building-allarch-recipes-again.patch \
15 " 14 "
16SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" 15SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb"
diff --git a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch
index a6c1b25c46..ca56a6a8bf 100644
--- a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch
@@ -21,7 +21,7 @@ index d29a77f..267acf9 100644
21- mlog.warning('Unknown CPU family {!r}, please report this at ' 21- mlog.warning('Unknown CPU family {!r}, please report this at '
22- 'https://github.com/mesonbuild/meson/issues/new with the' 22- 'https://github.com/mesonbuild/meson/issues/new with the'
23- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) 23- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
24+ raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) 24+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
25 25
26 return trial 26 return trial
27 27
@@ -30,7 +30,7 @@ index d29a77f..267acf9 100644
30 30
31 if entry == 'cpu_family' and res not in known_cpu_families: 31 if entry == 'cpu_family' and res not in known_cpu_families:
32- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) 32- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value)
33+ raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) 33+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value)
34 34
35 if self.ok_type(res): 35 if self.ok_type(res):
36 self.config[s][entry] = res 36 self.config[s][entry] = res
diff --git a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch b/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch
deleted file mode 100644
index 5295335730..0000000000
--- a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 31df0a854aa40c4ce8fbf1ca02ccc9b6bff0abfd Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 6 Jul 2018 15:51:15 +0100
4Subject: [PATCH] Send user to our wiki instead of Meson bug system
5
6If a CPU family isn't recognised the first step should be to verify the
7mapping. Send the user to a wiki page explaining what to do, instead of
8directly to the Meson bug tracker.
9
10Upstream-Status: Inappropriate [OE specific]
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12
13---
14 mesonbuild/environment.py | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
18index 267acf9..19a3c1e 100644
19--- a/mesonbuild/environment.py
20+++ b/mesonbuild/environment.py
21@@ -239,7 +239,7 @@ def detect_cpu_family(compilers):
22 return 'x86_64'
23
24 if trial not in known_cpu_families:
25- raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial)
26+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
27
28 return trial
29
30@@ -1012,7 +1012,7 @@ class CrossBuildInfo:
31 raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
32
33 if entry == 'cpu_family' and res not in known_cpu_families:
34- raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial)
35+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value)
36
37 if self.ok_type(res):
38 self.config[s][entry] = res