From 29e280ee11c9a6f13c004ff25299668e4616f275 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Mon, 12 Feb 2018 10:20:41 -0600 Subject: waf-samba.bbclass: No longer inherit waf.bbclass waf-samba.bbclass uses waf in a very different way than the "standard" method that waf.bbclass targets and ends getting very little useful functionality from that class. Signed-off-by: Joshua Watt Signed-off-by: Armin Kuster --- meta-networking/classes/waf-samba.bbclass | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'meta-networking/classes') diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index a63842cadc..1632c3c60e 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass @@ -1,7 +1,7 @@ # waf is a build system which is used by samba related project. # Obtain details from https://wiki.samba.org/index.php/Waf -# -inherit qemu pythonnative waf +# +inherit qemu pythonnative DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python" @@ -21,6 +21,29 @@ CONFIGUREOPTS = " --prefix=${prefix} \ ${PACKAGECONFIG_CONFARGS} \ " +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +def get_waf_parallel_make(d): + pm = d.getVar('PARALLEL_MAKE') + if pm: + # look for '-j' and throw other options (e.g. '-l') away + # because they might have different meaning in bjam + pm = pm.split() + while pm: + opt = pm.pop(0) + if opt == '-j': + v = pm.pop(0) + elif opt.startswith('-j'): + v = opt[2:].strip() + else: + continue + + v = min(64, int(v)) + return '-j' + str(v) + + return "" + # Three methods for waf cross compile: # 1. answers: # Only --cross-answers - try the cross-answers file, and if @@ -86,6 +109,7 @@ do_configure() { fi } +do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+" do_compile () { python ./buildtools/bin/waf ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} } -- cgit 1.2.3-korg