mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

waf.bbclass: explicitly pass bindir and libdir if supported

Browse Source 
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.

(From OE-Core rev: eac21f981337bfaddb2d67161a1ff049158041ce)

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 923f91d8d8606141ce218927bc943f4f4f34bcdd)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Agner
2017-12-12 17:13:24 +01:00
committed by Richard Purdie
parent a3eba3947e
commit 1b8f0fa9b1
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/waf.bbclass
View File

@@ -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() {