diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index bc0d9b7ab..8e703c638 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -1,8 +1,8 @@ -TERMUX_PKG_HOMEPAGE=http://nodejs.org/ +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.9.2 +TERMUX_PKG_VERSION=6.9.3 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=997121460f3b4757907c2d7ff68ebdbf87af92b85bf2d07db5a7cb7aa5dae7d9 +TERMUX_PKG_SHA256=5abdc3b77e011d664e13d74cab130680a8652b5cd23a63d2a17496d91399d5b5 # 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/common.gypi.patch b/packages/nodejs/common.gypi.patch deleted file mode 100644 index f70ac38cd..000000000 --- a/packages/nodejs/common.gypi.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -u -r ../node-v6.5.0/common.gypi ./common.gypi ---- ../node-v6.5.0/common.gypi 2016-08-26 11:27:16.000000000 -0400 -+++ ./common.gypi 2016-09-14 18:33:18.677745057 -0400 -@@ -78,7 +78,10 @@ - }], - ['OS == "android"', { - 'cflags': [ '-fPIE' ], -- 'ldflags': [ '-fPIE', '-pie' ] -+ 'ldflags': [ '-fPIE' ], -+ 'target_conditions': [ -+ ['_type == "executable"', {'ldflags': [ '-pie' ]}] -+ ] - }], - ['node_shared=="true"', { - 'msvs_settings': { -@@ -128,7 +131,10 @@ - }], - ['OS == "android"', { - 'cflags': [ '-fPIE' ], -- 'ldflags': [ '-fPIE', '-pie' ] -+ 'ldflags': [ '-fPIE' ], -+ 'target_conditions': [ -+ ['_type == "executable"', {'ldflags': [ '-pie' ]}] -+ ] - }], - ['node_shared=="true"', { - 'msvs_settings': { diff --git a/packages/nodejs/configure.patch b/packages/nodejs/configure.patch deleted file mode 100644 index 9fef4a564..000000000 --- a/packages/nodejs/configure.patch +++ /dev/null @@ -1,29 +0,0 @@ -XXX: Revert https://github.com/nodejs/node/pull/3135 since it causes -problems when trying to compile on Android with shared libuv, zlib -and openssl due to v8 not using stlport correctly. - -diff -u -r ../node-v5.4.1/configure ./configure ---- ../node-v5.4.1/configure 2016-01-12 16:21:55.000000000 -0500 -+++ ./configure 2016-01-14 21:32:40.404401232 -0500 -@@ -771,15 +771,15 @@ - if pkg_cflags: - output['include_dirs'] += ( - filter(None, map(str.strip, pkg_cflags.split('-I')))) -- elif options.__dict__[shared_lib + '_includes']: -- output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] -+ #elif options.__dict__[shared_lib + '_includes']: -+ # output['include_dirs'] += [options.__dict__[shared_lib + '_includes']] - - # libpath needs to be provided ahead libraries - if pkg_libpath: -- output['libraries'] += [pkg_libpath] -- elif options.__dict__[shared_lib + '_libpath']: -- output['libraries'] += [ -- '-L%s' % options.__dict__[shared_lib + '_libpath']] -+ output['libraries'] += filter(None, map(str.strip, pkg_cflags.split('-L'))) -+ #elif options.__dict__[shared_lib + '_libpath']: -+ # output['libraries'] += [ -+ # '-L%s' % options.__dict__[shared_lib + '_libpath']] - - default_libs = getattr(options, shared_lib + '_libname') - default_libs = map('-l{0}'.format, default_libs.split(','))