mirror of
https://git.yoctoproject.org/poky
synced 2026-02-23 18:09:40 +01:00
e898f65b33
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
(From OE-Core rev: 4a82c7ca74075b4c22be94891eecc24238bd0e65)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
85 lines
3.1 KiB
Plaintext
85 lines
3.1 KiB
Plaintext
#
|
|
# Copyright OpenEmbedded Contributors
|
|
#
|
|
# SPDX-License-Identifier: MIT
|
|
#
|
|
|
|
# avoids build breaks when using no-static-libs.inc
|
|
DISABLE_STATIC = ""
|
|
|
|
# What Python interpretter to use. Defaults to Python 3 but can be
|
|
# overridden if required.
|
|
WAF_PYTHON ?= "python3"
|
|
|
|
B = "${WORKDIR}/build"
|
|
do_configure[cleandirs] += "${B}"
|
|
|
|
EXTRA_OECONF:append = " ${PACKAGECONFIG_CONFARGS}"
|
|
|
|
EXTRA_OEWAF_BUILD ??= ""
|
|
# In most cases, you want to pass the same arguments to `waf build` and `waf
|
|
# install`, but you can override it if necessary
|
|
EXTRA_OEWAF_INSTALL ??= "${EXTRA_OEWAF_BUILD}"
|
|
|
|
def waflock_hash(d):
|
|
# Calculates the hash used for the waf lock file. This should include
|
|
# all of the user controllable inputs passed to waf configure. Note
|
|
# that the full paths for ${B} and ${S} are used; this is OK and desired
|
|
# because a change to either of these should create a unique lock file
|
|
# to prevent collisions.
|
|
import hashlib
|
|
h = hashlib.sha512()
|
|
def update(name):
|
|
val = d.getVar(name)
|
|
if val is not None:
|
|
h.update(val.encode('utf-8'))
|
|
update('S')
|
|
update('B')
|
|
update('prefix')
|
|
update('EXTRA_OECONF')
|
|
return h.hexdigest()
|
|
|
|
# Use WAFLOCK to specify a separate lock file. The build is already
|
|
# sufficiently isolated by setting the output directory, this ensures that
|
|
# bitbake won't step on toes of any other configured context in the source
|
|
# directory (e.g. if the source is coming from externalsrc and was previously
|
|
# configured elsewhere).
|
|
export WAFLOCK = ".lock-waf_oe_${@waflock_hash(d)}_build"
|
|
BB_BASEHASH_IGNORE_VARS += "WAFLOCK"
|
|
|
|
python waf_preconfigure() {
|
|
import subprocess
|
|
subsrcdir = d.getVar('S')
|
|
python = d.getVar('WAF_PYTHON')
|
|
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 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)
|
|
except FileNotFoundError:
|
|
bb.fatal("waf does not exist in %s" % subsrcdir)
|
|
}
|
|
|
|
do_configure[prefuncs] += "waf_preconfigure"
|
|
|
|
waf_do_configure() {
|
|
(cd ${S} && ${WAF_PYTHON} ./waf configure -o ${B} --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF})
|
|
}
|
|
|
|
do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
|
|
waf_do_compile() {
|
|
(cd ${S} && ${WAF_PYTHON} ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} ${EXTRA_OEWAF_BUILD})
|
|
}
|
|
|
|
waf_do_install() {
|
|
(cd ${S} && ${WAF_PYTHON} ./waf install --destdir=${D} ${EXTRA_OEWAF_INSTALL})
|
|
}
|
|
|
|
EXPORT_FUNCTIONS do_configure do_compile do_install
|