From 39906f5d4d83d4fbed872f4dad66915a11276f65 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 12 Nov 2021 12:07:49 +0000 Subject: [PATCH] insane: remove unrecognised option check for Meson Meson 0.60 onwards no longer simply warns when an unrecognised option is passed, it errors out instead. This means we can remove the logic in insane.bbclass to check for the warnings. (From OE-Core rev: 472acf29abd4cdc9d8ef10a1940a541275d508cf) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 1675adf6ac..27b1a00fb9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1229,15 +1229,12 @@ Rerun configure task after fixing this.""" ########################################################################### # Check unrecognised configure options (with a white list) ########################################################################### - if bb.data.inherits_class("autotools", d) or bb.data.inherits_class("meson", d): + if bb.data.inherits_class("autotools", d): bb.note("Checking configure output for unrecognised options") try: if bb.data.inherits_class("autotools", d): flag = "WARNING: unrecognized options:" log = os.path.join(d.getVar('B'), 'config.log') - if bb.data.inherits_class("meson", d): - flag = "WARNING: Unknown options:" - log = os.path.join(d.getVar('T'), 'log.do_configure') output = subprocess.check_output(['grep', '-F', flag, log]).decode("utf-8").replace(', ', ' ').replace('"', '') options = set() for line in output.splitlines():