Patchwork [meta-oe,PATCHv3,4/5] cloud9: use node4 to build o3-xml binary

login
register
mail settings
Submitter Koen Kooi
Date April 12, 2013, 10:04 a.m.
Message ID <1365761087-1229-4-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/48007/
State Accepted, archived
Commit 5ce31df17f12bb4507eae2b383f5462952dfa7b5
Headers show

Comments

Koen Kooi - April 12, 2013, 10:04 a.m.
Using node 0.8.x will make it crash at runtime

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index a78c653..0c07b12 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -5,7 +5,8 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
 PR = "r2"
 
-DEPENDS = "libxml2 nodejs-native"
+# Nodejs-native for node-waf, nodejs4-native for the headers
+DEPENDS = "libxml2 nodejs-native nodejs4-native"
 
 SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
@@ -68,11 +69,11 @@  do_configure () {
  node-waf -vv configure
 }
 
-EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node -fPIC -DPIC"
+EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node4 -fPIC -DPIC"
 
 do_compile () {
  cd ${WORKDIR}/o3
- node tools/gluegen.js
+ node4 tools/gluegen.js
  cd hosts
  ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc
  ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc