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:57:37 +0100 |
commit | 5f0f70d4307cec5253a556133312a3a80fee45aa (patch) | |
tree | 65e283f0d7c657ce82d76540aab6a2a6d26022d0 /meta | |
parent | 701cc0009f690a4d1eb12a47e3116f81d0c4b732 (diff) | |
download | poky-5f0f70d4307cec5253a556133312a3a80fee45aa.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.
(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>
Diffstat (limited to 'meta')
-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): | |||
25 | 25 | ||
26 | return "" | 26 | return "" |
27 | 27 | ||
28 | python waf_preconfigure() { | ||
29 | from distutils.version import StrictVersion | ||
30 | srcsubdir = d.getVar('S') | ||
31 | wafbin = os.path.join(srcsubdir, 'waf') | ||
32 | status, result = oe.utils.getstatusoutput(wafbin + " --version") | ||
33 | if status != 0: | ||
34 | bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % status) | ||
35 | return | ||
36 | version = result.split()[1] | ||
37 | if StrictVersion(version) >= StrictVersion("1.8.7"): | ||
38 | d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}") | ||
39 | } | ||
40 | |||
41 | do_configure[prefuncs] += "waf_preconfigure" | ||
42 | |||
43 | waf_do_configure() { | 28 | waf_do_configure() { |
44 | ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF} | 29 | ${S}/waf configure --prefix=${prefix} ${EXTRA_OECONF} |
45 | } | 30 | } |
46 | 31 | ||
47 | waf_do_compile() { | 32 | waf_do_compile() { |