aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking/classes
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-12-23 01:04:35 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-01-19 09:26:15 +0100
commit9beb04e98d9a6b2dfe95966e2768f886b4092e27 (patch)
treecce324f66669a11d26f729facb486162b828916b /meta-networking/classes
parentcc32689a5b55843eeaecda173933fd5f281ec3ff (diff)
downloadmeta-openembedded-contrib-9beb04e98d9a6b2dfe95966e2768f886b4092e27.tar.gz
meta-openembedded-contrib-9beb04e98d9a6b2dfe95966e2768f886b4092e27.tar.bz2
meta-openembedded-contrib-9beb04e98d9a6b2dfe95966e2768f886b4092e27.zip
waf-samba.bbclass: fix build error with PARALLEL_MAKE="-j X -l Y"
Waf doesn't handle -l. Use a function already provided by waf.bbclass in OE-Core. Inheriting waf.bbclass also makes overriding DISABLE_STATIC redundant, so drop it from recipes inheriting waf-samba. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/classes')
-rw-r--r--meta-networking/classes/waf-samba.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
index af4c7d0bee..b94ed4853d 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
+inherit qemu pythonnative waf
DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python"
@@ -86,7 +86,7 @@ do_configure() {
}
do_compile () {
- python ./buildtools/bin/waf ${PARALLEL_MAKE}
+ python ./buildtools/bin/waf ${@get_waf_parallel_make(d)}
}
do_install() {