waf.bbclass: Print waf output on unparsable version

On AB runs of reproducible-meta-oe/Repro meta-oe/meta-oe,
"waf --version" does not seem to contain the version but an error
message with "RuntimeWarning: <something>" [0].

Since the actual output is not saved anywhere, it is quite hard to
debug.

This patch detects the problematic case and send it to the log where it
will be seen and fixed. As a side-effect, this error will now only be a
warning.

Here is a partial backtrace for this (full back trace visible in [0]):
  NOTE: recipe mpv-0.35.1-r0: task do_configure: Started
  ERROR: mpv-0.35.1-r0 do_configure: Error executing a python function in exec_func_python() autogenerated:

  The stack trace of python calls that resulted in this exception/failure was:
  File: 'exec_func_python() autogenerated', lineno: 2, function: <module>
   *** 0002:waf_preconfigure(d)
  File: '$TOP/meta/classes-recipe/waf.bbclass', lineno: 58, function: waf_preconfigure
       0056:        result = subprocess.check_output([python, wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT)
       0057:        version = result.decode('utf-8').split()[1]
   *** 0058:        if bb.utils.vercmp_string_op(version, "1.8.7", ">="):
  [...]
  File: '$TOP/bitbake/lib/bb/utils.py', lineno: 91, function: split_version
   *** 0091:        e = int(s.split(":")[0])
  Exception: ValueError: invalid literal for int() with base 10: 'RuntimeWarning'

[0]: https://autobuilder.yoctoproject.org/typhoon/#/builders/155/builds/11/steps/32/logs/stdio line 31883

Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/waf.bbclass b/meta/classes-recipe/waf.bbclass
index 5fa0cc498712e79f7f5bba6ef5fd60135f6e4e48..70bf3be8fd19ca9cb9e9df19f441a11c40b9ff5a 100644 (file)
--- a/meta/classes-recipe/waf.bbclass
+++ b/meta/classes-recipe/waf.bbclass
@@ -55,7 +55,10 @@ python waf_preconfigure() {
     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", ">="):
+        if 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", ">="):
             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)