diff options
-rw-r--r-- | meta/classes/insane.bbclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 4267cbd0f6..a9be88e816 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -1141,12 +1141,16 @@ Rerun configure task after fixing this.""" | |||
1141 | ########################################################################### | 1141 | ########################################################################### |
1142 | # Check unrecognised configure options (with a white list) | 1142 | # Check unrecognised configure options (with a white list) |
1143 | ########################################################################### | 1143 | ########################################################################### |
1144 | if bb.data.inherits_class("autotools", d): | 1144 | if bb.data.inherits_class("autotools", d) or bb.data.inherits_class("meson", d): |
1145 | bb.note("Checking configure output for unrecognised options") | 1145 | bb.note("Checking configure output for unrecognised options") |
1146 | try: | 1146 | try: |
1147 | flag = "WARNING: unrecognized options:" | 1147 | if bb.data.inherits_class("autotools", d): |
1148 | log = os.path.join(d.getVar('B'), 'config.log') | 1148 | flag = "WARNING: unrecognized options:" |
1149 | output = subprocess.check_output(['grep', '-F', flag, log]).decode("utf-8").replace(', ', ' ') | 1149 | log = os.path.join(d.getVar('B'), 'config.log') |
1150 | if bb.data.inherits_class("meson", d): | ||
1151 | flag = "WARNING: Unknown options:" | ||
1152 | log = os.path.join(d.getVar('T'), 'log.do_configure') | ||
1153 | output = subprocess.check_output(['grep', '-F', flag, log]).decode("utf-8").replace(', ', ' ').replace('"', '') | ||
1150 | options = set() | 1154 | options = set() |
1151 | for line in output.splitlines(): | 1155 | for line in output.splitlines(): |
1152 | options |= set(line.partition(flag)[2].split()) | 1156 | options |= set(line.partition(flag)[2].split()) |