nodejs: Update from 6.10.3 to 6.11.0
authorFredrik Fornwall <fredrik@fornwall.net>
Tue, 6 Jun 2017 21:11:56 +0000 (23:11 +0200)
committerFredrik Fornwall <fredrik@fornwall.net>
Tue, 6 Jun 2017 21:11:56 +0000 (23:11 +0200)
packages/nodejs/build.sh
packages/nodejs/deps-uv-uv.gyp.patch [new file with mode: 0644]

index e823c6e..8a9c5ef 100644 (file)
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
-TERMUX_PKG_VERSION=6.10.3
+TERMUX_PKG_VERSION=6.11.0
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=a8f679f595fd921305c28d126935ad59b4419ac8474a99997a31e01ab50acd3d
+TERMUX_PKG_SHA256=821f518c9b25b7dc52c4d87fce4dbf6df3227aba92f0d008ec9d1f32e5f603d9
 # Note that we do not use a shared libuv to avoid an issue with the Android
 # linker, which does not use symbols of linked shared libraries when resolving
 # symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462.
diff --git a/packages/nodejs/deps-uv-uv.gyp.patch b/packages/nodejs/deps-uv-uv.gyp.patch
new file mode 100644 (file)
index 0000000..972b6b0
--- /dev/null
@@ -0,0 +1,21 @@
+Patch to prepend include_dirs to avoid clashing with the
+Termux system libuv which may be of a different version.
+
+diff -u -r ../node-v6.11.0/deps/uv/uv.gyp ./deps/uv/uv.gyp
+--- ../node-v6.11.0/deps/uv/uv.gyp     2017-06-06 21:24:24.000000000 +0200
++++ ./deps/uv/uv.gyp   2017-06-06 23:02:53.780158175 +0200
+@@ -45,12 +45,12 @@
+     {
+       'target_name': 'libuv',
+       'type': '<(uv_library)',
+-      'include_dirs': [
++      'include_dirs+': [
+         'include',
+         'src/',
+       ],
+       'direct_dependent_settings': {
+-        'include_dirs': [ 'include' ],
++        'include_dirs+': [ 'include' ],
+         'conditions': [
+           ['OS != "win"', {
+             'defines': [