diff options
author | Ross Burton <ross@burtonini.com> | 2021-11-12 12:07:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-13 16:11:27 +0000 |
commit | 39906f5d4d83d4fbed872f4dad66915a11276f65 (patch) | |
tree | aadb48840972295d69242d4a2935723f2a591815 /meta/classes/insane.bbclass | |
parent | ca97a835fea2c1216ea1f5032b4301c9778c4462 (diff) | |
download | poky-39906f5d4d83d4fbed872f4dad66915a11276f65.tar.gz |
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 <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/insane.bbclass')
-rw-r--r-- | meta/classes/insane.bbclass | 5 |
1 files changed, 1 insertions, 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.""" | |||
1229 | ########################################################################### | 1229 | ########################################################################### |
1230 | # Check unrecognised configure options (with a white list) | 1230 | # Check unrecognised configure options (with a white list) |
1231 | ########################################################################### | 1231 | ########################################################################### |
1232 | if bb.data.inherits_class("autotools", d) or bb.data.inherits_class("meson", d): | 1232 | if bb.data.inherits_class("autotools", d): |
1233 | bb.note("Checking configure output for unrecognised options") | 1233 | bb.note("Checking configure output for unrecognised options") |
1234 | try: | 1234 | try: |
1235 | if bb.data.inherits_class("autotools", d): | 1235 | if bb.data.inherits_class("autotools", d): |
1236 | flag = "WARNING: unrecognized options:" | 1236 | flag = "WARNING: unrecognized options:" |
1237 | log = os.path.join(d.getVar('B'), 'config.log') | 1237 | log = os.path.join(d.getVar('B'), 'config.log') |
1238 | if bb.data.inherits_class("meson", d): | ||
1239 | flag = "WARNING: Unknown options:" | ||
1240 | log = os.path.join(d.getVar('T'), 'log.do_configure') | ||
1241 | output = subprocess.check_output(['grep', '-F', flag, log]).decode("utf-8").replace(', ', ' ').replace('"', '') | 1238 | output = subprocess.check_output(['grep', '-F', flag, log]).decode("utf-8").replace(', ', ' ').replace('"', '') |
1242 | options = set() | 1239 | options = set() |
1243 | for line in output.splitlines(): | 1240 | for line in output.splitlines(): |