waf-samba.bbclass: No longer inherit waf.bbclass
PATCH 1/1 waf-samba.bbclass: No longer inherit waf.bbclass
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.
--- meta-networking/classes/waf-samba.bbclass | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
meta-networking/classes/waf-samba.bbclass +27 -2
@@ -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 + + 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
Signature · 1 line
2.14.3
Quoted 35 lines · 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 <[email protected]>--- meta-networking/classes/waf-samba.bbclass | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)meta-networking/classes/waf-samba.bbclass +10
-2@@ -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
meta-networking/classes/waf-samba.bbclass CONFIGUREOPTS = " --prefix=${prefix} \ · line 41
Quoted 10 lines
meta-networking/classes/waf-samba.bbclass +10
-0+ 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
Quoted 11 lines
meta-networking/classes/waf-samba.bbclass +7
-0+ + 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
On Feb 11, 2018 20:29, "Robert Yang" <[email protected]> wrote:
Quoted 36 lines · 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 <[email protected]>--- meta-networking/classes/waf-samba.bbclass | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)meta-networking/classes/waf-samba.bbclass +2
-2@@ -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-nativepython"
@@ -21,6 +21,31 @@ CONFIGUREOPTS = " --prefix=${prefix} \ ${PACKAGECONFIG_CONFARGS} \ "+# avoids build breaks when using no-static-libs.inc
meta-networking/classes/waf-samba.bbclass +7
-0+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
meta-networking/classes/waf-samba.bbclass CONFIGUREOPTS = " --prefix=${prefix} \ · line 41
Quoted 10 lines
meta-networking/classes/waf-samba.bbclass +10
-0+ 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.
True. This is a straight copy from waf.bbclass, but we can optimize. I'm planning on proposing a or.utils.get_parallel_make(), because this code is copied (with minor variants) several places.
// Robert
+
Quoted 11 lines
meta-networking/classes/waf-samba.bbclass +6
-0+ 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
PATCH v2 1/1 waf-samba.bbclass: No longer inherit waf.bbclass
In reply to Joshua Wattwaf-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.
--- meta-networking/classes/waf-samba.bbclass | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
meta-networking/classes/waf-samba.bbclass +26 -2
@@ -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)} }
Signature · 1 line
2.14.3
This works for me.
Quoted 68 lines · 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 <[email protected]>--- meta-networking/classes/waf-samba.bbclass | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)meta-networking/classes/waf-samba.bbclass +2
-2@@ -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-nativepython"
meta-networking/classes/waf-samba.bbclass +24
-1@@ -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