From 89f167db2ddcee6e2252a70ab5b3c0a49a3b0982 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 14 Oct 2018 20:30:58 +0200 Subject: [PATCH] nodejs: Update from 10.11.0 to 10.12.0 --- packages/nodejs/build.sh | 4 ++-- packages/nodejs/node.gyp.patch | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index 2f8d7194a..d39a1daf3 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -1,7 +1,7 @@ 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=10.11.0 -TERMUX_PKG_SHA256=b91242c2599db23db9261673500969510fdc7e74426e8d80f1a679b12c7f8e9b +TERMUX_PKG_VERSION=10.12.0 +TERMUX_PKG_SHA256=d9cd890d6c3b060f7a5497a522564328fe73ec39dda082f41c4141a73ac30ae4 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz # 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 diff --git a/packages/nodejs/node.gyp.patch b/packages/nodejs/node.gyp.patch index 6ca718eec..54a7affd9 100644 --- a/packages/nodejs/node.gyp.patch +++ b/packages/nodejs/node.gyp.patch @@ -1,11 +1,11 @@ -diff -u -r ../node-v10.11.0/node.gyp ./node.gyp ---- ../node-v10.11.0/node.gyp 2018-09-20 07:28:40.000000000 +0000 -+++ ./node.gyp 2018-09-20 23:29:49.101088165 +0000 -@@ -936,76 +936,6 @@ +diff -u -r ../node-v10.12.0/node.gyp ./node.gyp +--- ../node-v10.12.0/node.gyp 2018-10-10 19:20:38.000000000 +0000 ++++ ./node.gyp 2018-10-14 18:17:36.653712569 +0000 +@@ -892,81 +892,7 @@ ], } ], ] -- }, +- }, # rename_node_bin_win - { - 'target_name': 'cctest', - 'type': 'executable', @@ -14,7 +14,6 @@ diff -u -r ../node-v10.11.0/node.gyp ./node.gyp - '<(node_lib_target_name)', - 'rename_node_bin_win', - 'deps/gtest/gtest.gyp:gtest', -- 'node_js2c#host', - 'node_dtrace_header', - 'node_dtrace_ustack', - 'node_dtrace_provider', @@ -74,7 +73,14 @@ diff -u -r ../node-v10.11.0/node.gyp ./node.gyp - [ 'OS=="win" and node_shared=="true"', { - 'type': 'none', - }], +- [ 'node_shared=="true"', { +- 'xcode_settings': { +- 'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ], +- }, +- }], - ], - } +- }, # cctest ++ } # rename_node_bin_win ], # end targets + 'conditions': [