From eac21f981337bfaddb2d67161a1ff049158041ce Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 12 Dec 2017 17:13:24 +0100 Subject: waf.bbclass: explicitly pass bindir and libdir if supported On some build hosts distros (e.g. Fedora 26) waf tries to be smart about libdir detection and defaults to [EXEC_PREFIX/lib64]. This obviously is not what we want for 32-bit targets and usually fails in the do_package phase: WARNING: gstreamer1.0-plugins-imx-0.13.0-r0 do_package: QA Issue: gstreamer1.0-plugins-imx: Files/directories were installed but not shipped in any package: /usr/lib64/libgstimxcommon.so.0 ... Depending on version, waf knows prefix or prefix, bindir and libdir as default options. Explicitly pass the right set of arguments. Signed-off-by: Stefan Agner Signed-off-by: Ross Burton (cherry picked from commit 923f91d8d8606141ce218927bc943f4f4f34bcdd) Signed-off-by: Armin Kuster --- meta/classes/waf.bbclass | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass index c4698e910a..acbda278a2 100644 --- a/meta/classes/waf.bbclass +++ b/meta/classes/waf.bbclass @@ -25,8 +25,23 @@ def get_waf_parallel_make(d): return "" +python waf_preconfigure() { + from distutils.version import StrictVersion + srcsubdir = d.getVar('S') + wafbin = os.path.join(srcsubdir, 'waf') + status, result = oe.utils.getstatusoutput(wafbin + " --version") + if status != 0: + bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % status) + return + version = result.split()[1] + if StrictVersion(version) >= StrictVersion("1.8.7"): + d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") +} + +do_configure[prefuncs] += "waf_preconfigure" + waf_do_configure() { - ${S}/waf configure --prefix=${prefix} ${EXTRA_OECONF} + ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF} } waf_do_compile() { -- cgit 1.2.3-korg