diff options
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-extended/mraa/mraa_git.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-extended/upm/upm_git.bb | 8 |
2 files changed, 14 insertions, 2 deletions
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)}" diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 38065ce534..a5c2bb3211 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -26,7 +26,13 @@ inherit distutils3-base cmake # override this in local.conf to get needed bindings. # BINDINGS_pn-upm="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)}" |