Browse Source

nodejs: Update from 6.1 to 6.2

android-5
Fredrik Fornwall 9 years ago
parent
commit
1df225d6fc
  1. 3
      packages/nodejs/build.sh
  2. 12
      packages/nodejs/lib-child_process.js.patch
  3. 15
      packages/nodejs/src-node_config.cc.patch

3
packages/nodejs/build.sh

@ -1,6 +1,6 @@
TERMUX_PKG_HOMEPAGE=http://nodejs.org/
TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
TERMUX_PKG_VERSION=6.1.0
TERMUX_PKG_VERSION=6.2.0
TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="openssl, libuv, libgnustl, c-ares"
TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
@ -35,5 +35,6 @@ termux_step_configure () {
--dest-os=android \
--shared-openssl --shared-zlib --shared-libuv --shared-cares \
--without-snapshot \
--without-intl \
$_EXTRA_CONFIGURE_ARGS
}

12
packages/nodejs/lib-child_process.js.patch

@ -0,0 +1,12 @@
diff -u -r ../node-v6.2.0/lib/child_process.js ./lib/child_process.js
--- ../node-v6.2.0/lib/child_process.js 2016-05-17 15:53:06.000000000 -0400
+++ ./lib/child_process.js 2016-05-18 16:31:45.574685443 -0400
@@ -335,7 +335,7 @@
if (typeof options.shell === 'string')
file = options.shell;
else if (process.platform === 'android')
- file = '/system/bin/sh';
+ file = '@TERMUX_PREFIX@/bin/sh';
else
file = '/bin/sh';
args = ['-c', command];

15
packages/nodejs/src-node_config.cc.patch

@ -0,0 +1,15 @@
Backport of https://github.com/nodejs/node/pull/6820
diff -u -r ../node-v6.2.0/src/node_config.cc ./src/node_config.cc
--- ../node-v6.2.0/src/node_config.cc 2016-05-17 15:53:07.000000000 -0400
+++ ./src/node_config.cc 2016-05-18 16:45:34.588991777 -0400
@@ -29,8 +29,8 @@
void InitConfig(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
-#ifdef NODE_HAVE_I18N_SUPPORT
Environment* env = Environment::GetCurrent(context);
+#ifdef NODE_HAVE_I18N_SUPPORT
READONLY_BOOLEAN_PROPERTY("hasIntl");
Loading…
Cancel
Save