From 2913f7073f39a216ba215868f2d7e18a1ed05a2c Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Fri, 27 Oct 2017 16:35:46 +0300 Subject: mraa/upm: drop HAVE_NODEJS conditional HAVE_NODEJS is a leftover from meta-refkit-core where the layer had to adapt to different BBLAYER combinations (some where nodejs wasn't available but mraa/upm were). mraa/upm nodejs bindings currently fail to build (due to a problem in swig with nodejs > v7.x) so we keep them disabled until a newer version of swig lands in OE-core. The commit adds BINDINGS overrides for armv4/5 to remind that nodejs isn't available on those architectures. Signed-off-by: Mikko Ylinen Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/mraa/mraa_git.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta-oe/recipes-extended/mraa') diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index 616048fac9..c4b9c6f90e 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -31,7 +31,13 @@ FILES_${PN}-utils = "${bindir}/" # override this in local.conf to get needed bindings. # BINDINGS_pn-mraa="python" # will result in only the python bindings being built/packaged. -BINDINGS ??= "python ${@ 'nodejs' if oe.types.boolean(d.getVar('HAVE_NODEJS') or '0') else '' }" +# Note: 'nodejs' is disabled by default because the bindings +# generation currently fails with nodejs (>v7.x). +BINDINGS ??= "python" + +# nodejs isn't available for armv4/armv5 architectures +BINDINGS_armv4 ??= "python" +BINDINGS_armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" -- cgit 1.2.3-korg