summaryrefslogtreecommitdiffstats
path: root/meta/classes/meson.bbclass
diff options
context:
space:
mode:
authorAndreas M?ller <schnitzeltony@gmail.com>2020-04-16 00:30:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-17 16:31:54 +0100
commit6bf674374d568b2419a4c6eef00d893028878881 (patch)
tree0e57aa50bb994987c72f8fbe9bdf20ee6ec522a9 /meta/classes/meson.bbclass
parent72148cb9bf3bf259f01ef3555ec5e56aaa440cb1 (diff)
downloadpoky-6bf674374d568b2419a4c6eef00d893028878881.tar.gz
meson.bbclass: avoid unexpected operating-system names
For example 'linux-gnueabi' is not what meson consumers expect: See canonical table of OS names for Meson (thanks Ross). Surprisingly this did not pop up earlier but wrong system-name can break building as described in [1] [1] https://lists.openembedded.org/g/openembedded-core/topic/meson_host_machine_system/73023862 (From OE-Core rev: 010202076760329829fbde8dab4f535d6f755873) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/meson.bbclass')
-rw-r--r--meta/classes/meson.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index e9628033c6..ff52d20e56 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -68,6 +68,9 @@ def meson_operating_system(var, d):
68 os = d.getVar(var) 68 os = d.getVar(var)
69 if "mingw" in os: 69 if "mingw" in os:
70 return "windows" 70 return "windows"
71 # avoid e.g 'linux-gnueabi'
72 elif "linux" in os:
73 return "linux"
71 else: 74 else:
72 return os 75 return os
73 76