aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-02-12 10:20:41 -0600
committerArmin Kuster <akuster808@gmail.com>2018-03-09 13:27:36 -0800
commit685b57bbd94a8c73b87e60ef17cdeebaae1870d1 (patch)
tree5887f91ed4d170cd4564c10b718819d4b40b86b2
parentbd8959459ba88a22db17ad8280553656cee87c96 (diff)
downloadmeta-openembedded-contrib-stable/rocko-next.zip
meta-openembedded-contrib-stable/rocko-next.tar.gz
meta-openembedded-contrib-stable/rocko-next.tar.bz2
waf-samba.bbclass: No longer inherit waf.bbclassstable/rocko-next
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 <JPEWhacker@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit 29e280ee11c9a6f13c004ff25299668e4616f275) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/classes/waf-samba.bbclass28
1 files changed, 26 insertions, 2 deletions
diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
index e490176..0ce5161 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 ${@get_waf_parallel_make(d)}
}