diff options
Diffstat (limited to 'meta/classes-recipe/waf.bbclass')
-rw-r--r-- | meta/classes-recipe/waf.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes-recipe/waf.bbclass b/meta/classes-recipe/waf.bbclass index 5fa0cc4987..70bf3be8fd 100644 --- a/meta/classes-recipe/waf.bbclass +++ b/meta/classes-recipe/waf.bbclass | |||
@@ -55,7 +55,10 @@ python waf_preconfigure() { | |||
55 | try: | 55 | try: |
56 | result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) | 56 | result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT) |
57 | version = result.decode('utf-8').split()[1] | 57 | version = result.decode('utf-8').split()[1] |
58 | if bb.utils.vercmp_string_op(version, "1.8.7", ">="): | 58 | if not bb.utils.is_semver(version): |
59 | bb.warn("Unable to parse \"waf --version\" output. Assuming waf version without bindir/libdir support.") | ||
60 | bb.warn("waf·--version·output = \n%s" % result.decode('utf-8')) | ||
61 | elif bb.utils.vercmp_string_op(version, "1.8.7", ">="): | ||
59 | d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") | 62 | d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") |
60 | except subprocess.CalledProcessError as e: | 63 | except subprocess.CalledProcessError as e: |
61 | bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) | 64 | bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode) |