diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2018-04-25 14:07:13 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-07 15:56:28 +0100 |
| commit | 74c26c2f63121d92d50b0cca4d3288b8d196b777 (patch) | |
| tree | c1d3f9ce612e148c49b2fedbf923c31da9d9f310 /meta/classes | |
| parent | d20917f3ce9ac45fb9562d1cabf7ddc212b1d07a (diff) | |
| download | openembedded-core-74c26c2f63121d92d50b0cca4d3288b8d196b777.tar.gz | |
Revert "waf.bbclass: explicitly pass bindir and libdir if supported"
* 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.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/waf.bbclass | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass index acbda278a2..c4698e910a 100644 --- a/meta/classes/waf.bbclass +++ b/meta/classes/waf.bbclass @@ -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() { |