Re: [oe] [meta-networking][PATCH v2] waf-samba.bbclass: No longer inherit waf.bbclass

[Kyle Russell]

This works for me.

On Mon, Feb 12, 2018 at 11:20 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 
> ---
>  meta-networking/classes/waf-samba.bbclass | 28
> ++--
>  1 file changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/meta-networking/classes/waf-samba.bbclass
> b/meta-networking/classes/waf-samba.bbclass
> index e490176241..0ce51610f3 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)}
>  }
> --
> 2.14.3
>
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH v2] waf-samba.bbclass: No longer inherit waf.bbclass

[Joshua Watt]

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 
---
 meta-networking/classes/waf-samba.bbclass | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/meta-networking/classes/waf-samba.bbclass 
b/meta-networking/classes/waf-samba.bbclass
index e490176241..0ce51610f3 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)}
 }
-- 
2.14.3

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