mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-02 17:12:39 +00:00
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. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
5203842351
commit
29e280ee11
@ -1,7 +1,7 @@
|
|||||||
# waf is a build system which is used by samba related project.
|
# waf is a build system which is used by samba related project.
|
||||||
# Obtain details from https://wiki.samba.org/index.php/Waf
|
# 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"
|
DEPENDS += "qemu-native libxslt-native docbook-xsl-stylesheets-native python"
|
||||||
|
|
||||||
@ -21,6 +21,29 @@ CONFIGUREOPTS = " --prefix=${prefix} \
|
|||||||
${PACKAGECONFIG_CONFARGS} \
|
${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:
|
# Three methods for waf cross compile:
|
||||||
# 1. answers:
|
# 1. answers:
|
||||||
# Only --cross-answers - try the cross-answers file, and if
|
# Only --cross-answers - try the cross-answers file, and if
|
||||||
@ -86,6 +109,7 @@ do_configure() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
|
||||||
do_compile () {
|
do_compile () {
|
||||||
python ./buildtools/bin/waf ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
|
python ./buildtools/bin/waf ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user