diff options
Diffstat (limited to 'meta/classes-recipe/waf.bbclass')
| -rw-r--r-- | meta/classes-recipe/waf.bbclass | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/meta/classes-recipe/waf.bbclass b/meta/classes-recipe/waf.bbclass index 5fa0cc4987..01707c8e2c 100644 --- a/meta/classes-recipe/waf.bbclass +++ b/meta/classes-recipe/waf.bbclass @@ -54,8 +54,21 @@ python waf_preconfigure() { wafbin = os.path.join(subsrcdir, 'waf') try: result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) - version = result.decode('utf-8').split()[1] - if bb.utils.vercmp_string_op(version, "1.8.7", ">="): + # Output looks like: + # # output from lower modules (e.g. warnings, ...) + # waf X.Y.Z ... + # So, look for the line starting with "waf " + version = None + for line in result.decode('utf-8').split("\n"): + if line.startswith("waf "): + version = line.split()[1] + break + + if not version or not bb.utils.is_semver(version): + bb.warn("Unable to parse \"waf --version\" output. Assuming waf version without bindir/libdir support.") + bb.warn("waf·--version·output = \n%s" % result.decode('utf-8')) + elif bb.utils.vercmp_string_op(version, "1.8.7", ">="): + bb.note("waf version is high enough to add --bindir and --libdir") d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") except subprocess.CalledProcessError as e: bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) |