mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 01:06:37 +01:00
bb40162b2b
waf requires that the current working directory be the project root (in
this case ${S} when it is invoked. The check to get the waf version was
being executed as a prefunc for do_configure, which meant it was
executed before the current working directory was switched to ${S}, and
thus would fail with some recipes. Fix this by changing to ${S} before
executing "waf --version"
(From OE-Core rev: aa168ee7f785ff007ca645db57698883922b5eb3)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
58 lines
1.7 KiB
Plaintext
58 lines
1.7 KiB
Plaintext
# avoids build breaks when using no-static-libs.inc
|
|
DISABLE_STATIC = ""
|
|
|
|
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
|
|
|
|
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 ""
|
|
|
|
python waf_preconfigure() {
|
|
import subprocess
|
|
from distutils.version import StrictVersion
|
|
subsrcdir = d.getVar('S')
|
|
wafbin = os.path.join(subsrcdir, 'waf')
|
|
try:
|
|
result = subprocess.check_output([wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT)
|
|
version = result.decode('utf-8').split()[1]
|
|
if StrictVersion(version) >= StrictVersion("1.8.7"):
|
|
d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
|
|
except subprocess.CalledProcessError as e:
|
|
bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
|
|
}
|
|
|
|
do_configure[prefuncs] += "waf_preconfigure"
|
|
|
|
waf_do_configure() {
|
|
${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}
|
|
}
|
|
|
|
do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
|
|
waf_do_compile() {
|
|
${S}/waf build ${@get_waf_parallel_make(d)}
|
|
}
|
|
|
|
waf_do_install() {
|
|
${S}/waf install --destdir=${D}
|
|
}
|
|
|
|
EXPORT_FUNCTIONS do_configure do_compile do_install
|