From 6bf674374d568b2419a4c6eef00d893028878881 Mon Sep 17 00:00:00 2001 From: Andreas M?ller Date: Thu, 16 Apr 2020 00:30:36 +0200 Subject: meson.bbclass: avoid unexpected operating-system names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta') 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): os = d.getVar(var) if "mingw" in os: return "windows" + # avoid e.g 'linux-gnueabi' + elif "linux" in os: + return "linux" else: return os -- cgit v1.2.3-54-g00ecf