mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-26 19:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "waf.bbclass: explicitly pass bindir and libdir if supported"

Browse Source 
* this doesn't work correctly as discussed in:
  http://lists.openembedded.org/pipermail/openembedded-commits/2018-January/218460.html
* some of the issues were fixed in master since then
  but not all, so revert it until it's completely resolved

This reverts commit eac21f981337bfaddb2d67161a1ff049158041ce.

(From OE-Core rev: 74c26c2f63121d92d50b0cca4d3288b8d196b777)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2018-04-25 14:07:13 +00:00
committed by Richard Purdie
parent 701cc0009f
commit 5f0f70d430
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/waf.bbclass
View File

@@ -25,23 +25,8 @@ 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} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}
${S}/waf configure --prefix=${prefix} ${EXTRA_OECONF}
}
waf_do_compile() {