On 02/12/2018 05:51 AM, Joshua Watt wrote:
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 <jpewhac...@gmail.com>
---
  meta-networking/classes/waf-samba.bbclass | 29 +++++++++++++++++++++++++++--
  1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/meta-networking/classes/waf-samba.bbclass 
b/meta-networking/classes/waf-samba.bbclass
index e49017624..4b1499fd4 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,31 @@ 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:
+            v = None
+            opt = pm.pop(0)
+            if opt == '-j':
+                v = pm.pop(0)
+            elif opt.startswith('-j'):
+                v = opt[2:].strip()
+            else:
+                v = None

The "else:" block isn't needed ? The first line already set v to None.

// Robert

+
+            if v:
+                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

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Reply via email to