Update emscripten and nodejs

4 files changed, 27 insertions, 4 deletions

diff --git a/gnunet-build/.builder/config b/gnunet-build/.builder/config
index 1d8911b..c3d0177 100644
--- a/gnunet-build/.builder/config
+++ b/gnunet-build/.builder/config
@@ -9,4 +9,7 @@ export PATH
 EM_CONFIG="${SYSROOT}/${TOOLDIR}/etc/emscripten"
 export EM_CONFIG
 
+EM_CACHE="${SYSROOT}/${TOOLDIR}/var/cache/emscripten"
+export EM_CACHE
+
 # vim: filetype=sh
diff --git a/gnunet-build/packages/build-utils/emscripten-fastcomp/Buildrules b/gnunet-build/packages/build-utils/emscripten-fastcomp/Buildrules
index ee7ba32..6032f13 100644
--- a/gnunet-build/packages/build-utils/emscripten-fastcomp/Buildrules
+++ b/gnunet-build/packages/build-utils/emscripten-fastcomp/Buildrules
@@ -1,14 +1,29 @@
-VERSION="1.35.9"
+VERSION="1.37.28"
 DESCRIPTION="LLVM with the emscripten fastcomp javascript backend."
 SOURCE_URI="
 git://github.com/kripken/${NAME}.git?${VERSION}&archive=${NAME}-${VERSION}.${ARCHIVE_FORMAT}
 git://github.com/kripken/${NAME}-clang.git?${VERSION}&archive=${NAME}-clang-${VERSION}.${ARCHIVE_FORMAT}
 "
-CONFIG_OPTS="--enable-optimized --disable-assertions --enable-targets=host,js"
 
 pkg_prep()
 {
 	mv "${W}/${NAME}-clang-${VERSION}" "${S}/tools/clang"
 }
 
+pkg_compile() {
+  mkdir "${S}/build"
+  cd "${S}/build"
+  cmake -G "Unix Makefiles" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_TARGETS_TO_BUILD="X86;JSBackend" \
+    -DLLVM_INCLUDE_EXAMPLES=OFF \
+    -DLLVM_INCLUDE_TESTS=OFF \
+    -DCLANG_INCLUDE_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX="${SYSROOT}/${TOOLDIR}" \
+    "${S}"
+  make "${MAKE_OPTS}"
+  make DESTDIR="${D}" install
+  toolchain_fixup "${D}"
+}
+
 # vim: syntax=sh
diff --git a/gnunet-build/packages/build-utils/emscripten/Buildrules b/gnunet-build/packages/build-utils/emscripten/Buildrules
index b200df3..bf0d525 100644
--- a/gnunet-build/packages/build-utils/emscripten/Buildrules
+++ b/gnunet-build/packages/build-utils/emscripten/Buildrules
@@ -1,4 +1,4 @@
-VERSION="1.35.9"
+VERSION="1.37.28"
 DESCRIPTION="Emscripten is an LLVM-to-JavaScript compiler."
 SOURCE_URI="git://github.com/kripken/${NAME}.git?${VERSION}&archive=${NAME}-${VERSION}.${ARCHIVE_FORMAT}"
 RDEPENDS="build-utils/emscripten-fastcomp build-utils/node"
@@ -8,13 +8,18 @@ pkg_compile() {
 	mkdir -p "$(dirname "${INSTALLDIR}")"
 	cp -a "${S}" "${INSTALLDIR}"
 	mkdir -p "${D}/${TOOLDIR}/etc"
+	mkdir -p "${D}/${TOOLDIR}/var/cache/emscripten"
 	cat > "${D}/${TOOLDIR}/etc/emscripten" << EOF
 import os
 EMSCRIPTEN_ROOT = '${SYSROOT}/${TOOLDIR}/opt/emscripten'
 LLVM_ROOT = '${SYSROOT}/${TOOLDIR}/bin'
+PYTHON = os.path.expanduser(os.getenv('PYTHON') or '/usr/bin/python2')
 NODE_JS = '${SYSROOT}/${TOOLDIR}/bin/node'
+SPIDERMONKEY_ENGINE = [os.path.expanduser(os.getenv('SPIDERMONKEY') or 'js')]
+V8_ENGINE = os.path.expanduser(os.getenv('V8') or 'd8')
 JAVA = 'java'
 TEMP_DIR = os.path.expanduser(os.getenv('TEMP_DIR'))
+CRUNCH = os.path.expanduser(os.getenv('CRUNCH') or 'crunch')
 COMPILER_ENGINE = NODE_JS
 JS_ENGINES = [NODE_JS]
 EOF
diff --git a/gnunet-build/packages/build-utils/node/Buildrules b/gnunet-build/packages/build-utils/node/Buildrules
index 8a11306..dc250d9 100644
--- a/gnunet-build/packages/build-utils/node/Buildrules
+++ b/gnunet-build/packages/build-utils/node/Buildrules
@@ -1,4 +1,4 @@
-VERSION="0.10.24"
+VERSION="8.9.4"
 DESCRIPTION="Node.js is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications."
 SOURCE_URI="http://nodejs.org/dist/v${VERSION}/${NAME}-v${VERSION}.tar.gz"
 S="${W}/${NAME}-v${VERSION}"