[oe-commits] [meta-openembedded] 73/76: waf-samba.bbclass: fix build error with PARALLEL_MAKE="-j X -l Y"

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 10acfd41d64f1e89fad626014986263bd65671bd
Author: Andreas Oberritter <obi at opendreambox.org>
AuthorDate: Fri Dec 23 01:04:35 2016 +0100

    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 at opendreambox.org>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/classes/waf-samba.bbclass                     | 4 ++--
 meta-networking/recipes-connectivity/samba/samba_4.4.5.bb     | 1 -
 meta-networking/recipes-support/libldb/libldb_1.1.29.bb       | 1 -
 meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb  | 1 -
 meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb       | 1 -
 meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb | 1 -
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
index af4c7d0..b94ed48 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() {
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index c2436af..a126ac9 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -94,7 +94,6 @@ EXTRA_OECONF += "--enable-fhs \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix} \
                  --with-pam --with-pammodulesdir=${base_libdir}/security \
                 "
-DISABLE_STATIC = ""
 
 LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
diff --git a/meta-networking/recipes-support/libldb/libldb_1.1.29.bb b/meta-networking/recipes-support/libldb/libldb_1.1.29.bb
index 378bb89..2269a57 100644
--- a/meta-networking/recipes-support/libldb/libldb_1.1.29.bb
+++ b/meta-networking/recipes-support/libldb/libldb_1.1.29.bb
@@ -44,7 +44,6 @@ EXTRA_OECONF += "--disable-rpath \
                  --with-privatelibdir=${libdir}/ldb \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix}\
                 "
-DISABLE_STATIC = ""
 
 PACKAGES += "pyldb pyldb-dbg pyldb-dev"
 
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb
index 97a9a75..04e2f36 100644
--- a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb
+++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb
@@ -37,7 +37,6 @@ EXTRA_OECONF += "--disable-rpath \
                  --disable-silent-rules \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix}\
                 "
-DISABLE_STATIC = ""
 
 PACKAGES += "pytalloc pytalloc-dbg pytalloc-dev"
 
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb b/meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb
index 86f931c..3296bee 100644
--- a/meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb
+++ b/meta-networking/recipes-support/libtdb/libtdb_1.3.12.bb
@@ -33,7 +33,6 @@ EXTRA_OECONF += "--disable-rpath \
                  --builtin-libraries=replace \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix}\
                 "
-DISABLE_STATIC = ""
 
 PACKAGES += "tdb-tools python-tdb python-tdb-dbg"
 
diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb b/meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb
index 975f8f6..7939e03 100644
--- a/meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb
+++ b/meta-networking/recipes-support/libtevent/libtevent_0.9.31.bb
@@ -37,7 +37,6 @@ EXTRA_OECONF += "--disable-rpath \
                  --with-libiconv=${STAGING_DIR_HOST}${prefix}\
                  --without-gettext \
                 "
-DISABLE_STATIC = ""
 
 PACKAGES += "python-tevent python-tevent-dbg"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.