nodejs-current: Update from 8.4.0 to 8.7.0

diff --git a/packages/nodejs-current/build.sh b/packages/nodejs-current/build.sh
index f580cfb..e3a142f 100644 (file)
--- a/packages/nodejs-current/build.sh
+++ b/packages/nodejs-current/build.sh
@@ -1,8 +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=8.4.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=641a15fa822710ef2dc99793fec48d2a8ef75de0040b86568563d4ab296137ef
+TERMUX_PKG_VERSION=8.7.0
+TERMUX_PKG_SHA256=c7184526e5504fa2a91aff1aacd7c344451da539d73775b6d9ea8efe948d0fa8
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
 # 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
@@ -13,23 +12,6 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="nodejs"
 
 termux_step_configure () {
-       # See https://github.com/nodejs/build/issues/266 about enabling snapshots
-       # when cross compiling. We use {CC,CXX}_host for compilation of code to
-       # be run on the build maching (snapshots when cross compiling are
-       # generated using a CPU emulator provided by v8) and {CC,CXX} for the
-       # cross compile. We unset flags such as CFLAGS as they would affect
-       # both the host and cross compiled build.
-       # Remaining issue to be solved before enabling snapshots by removing
-       # the --without-snapshot flag is that pkg-config picks up cross compilation
-       # flags which breaks the host build.
-       export CC_host="gcc -pthread"
-       export CXX_host="g++ -pthread"
-       export CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS"
-       export CXX="$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS"
-       export CFLAGS="-Os"
-       export CXXFLAGS="-Os"
-       unset CPPFLAGS LDFLAGS
-
        if [ $TERMUX_ARCH = "arm" ]; then
                DEST_CPU="arm"
        elif [ $TERMUX_ARCH = "i686" ]; then
@@ -54,5 +36,6 @@ termux_step_configure () {
                --shared-zlib \
                --without-inspector \
                --without-intl \
+               --without-snapshot \
                --cross-compiling
 }

diff --git a/packages/nodejs-current/node.gyp.patch b/packages/nodejs-current/node.gyp.patch
index 24029a0..e2dc851 100644 (file)
--- a/packages/nodejs-current/node.gyp.patch
+++ b/packages/nodejs-current/node.gyp.patch
@@ -1,7 +1,7 @@
-diff -u -r ../node-v8.3.0/node.gyp ./node.gyp
---- ../node-v8.3.0/node.gyp    2017-08-09 20:48:31.000000000 +0200
-+++ ./node.gyp 2017-08-11 00:37:54.033951029 +0200
-@@ -559,147 +559,6 @@
+diff -u -r ../node-v8.7.0/node.gyp ./node.gyp
+--- ../node-v8.7.0/node.gyp    2017-10-11 14:36:02.000000000 +0200
++++ ./node.gyp 2017-10-14 19:41:03.915202106 +0200
+@@ -586,152 +586,6 @@
            ],
          } ],
        ]
@@ -64,30 +64,13 @@ diff -u -r ../node-v8.3.0/node.gyp ./node.gyp
 -        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
 -      ],
 -
--      'libraries': [
--        '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
--        '<(OBJ_PATH)<(OBJ_SEPARATOR)node_revert.<(OBJ_SUFFIX)',
--        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
--        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
--        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
--        '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
--      ],
--
 -      'defines': [ 'NODE_WANT_INTERNALS=1' ],
 -
 -      'sources': [
+-        'src/node_platform.cc',
+-        'src/node_platform.h',
+-        'test/cctest/node_test_fixture.cc',
+-        'test/cctest/test_aliased_buffer.cc',
 -        'test/cctest/test_base64.cc',
 -        'test/cctest/test_environment.cc',
 -        'test/cctest/test_util.cc',
@@ -99,6 +82,28 @@ diff -u -r ../node-v8.3.0/node.gyp ./node.gyp
 -      ],
 -
 -      'conditions': [
+-        ['node_target_type!="static_library"', {
+-          'libraries': [
+-            '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
+-            '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
+-            '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
+-            '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
+-            '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
+-            '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
+-          ],
+-        }],
 -        ['v8_enable_inspector==1', {
 -          'sources': [
 -            'test/cctest/test_inspector_socket.cc',

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 20a20b6..8f17bbf 100644 (file)
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -12,23 +12,6 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="nodejs-current"
 
 termux_step_configure () {
-       # See https://github.com/nodejs/build/issues/266 about enabling snapshots
-       # when cross compiling. We use {CC,CXX}_host for compilation of code to
-       # be run on the build maching (snapshots when cross compiling are
-       # generated using a CPU emulator provided by v8) and {CC,CXX} for the
-       # cross compile. We unset flags such as CFLAGS as they would affect
-       # both the host and cross compiled build.
-       # Remaining issue to be solved before enabling snapshots by removing
-       # the --without-snapshot flag is that pkg-config picks up cross compilation
-       # flags which breaks the host build.
-       #export CC_host="gcc -pthread"
-       #export CXX_host="g++ -pthread"
-       #export CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS"
-       #export CXX="$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS"
-       #export CFLAGS="-Os"
-       #export CXXFLAGS="-Os"
-       #unset CPPFLAGS LDFLAGS
-
        if [ $TERMUX_ARCH = "arm" ]; then
                DEST_CPU="arm"
        elif [ $TERMUX_ARCH = "i686" ]; then