[oe-commits] [meta-openembedded] 30/62: mraa/upm: drop HAVE_NODEJS conditional

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master
in repository meta-openembedded.

commit 2913f7073f39a216ba215868f2d7e18a1ed05a2c
Author: Mikko Ylinen <mikko.ylinen at linux.intel.com>
AuthorDate: Fri Oct 27 16:35:46 2017 +0300

    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 <mikko.ylinen at linux.intel.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-extended/mraa/mraa_git.bb | 8 +++++++-
 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 616048f..c4b9c6f 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 38065ce..a5c2bb3 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)}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.