X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/02380b95b32d1b82a6fb31a3b1cab45de4a5026c..73d77d8ac7562cd897c84c6cbcadc6346cd6dc27:/packages/nodejs/build.sh

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index add38c04..444792f1 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,30 +1,17 @@
-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.0.0
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="openssl, libuv, libgnustl"
+TERMUX_PKG_VERSION=8.9.3
+TERMUX_PKG_SHA256=748ddb3baa6b85e6a56e38aacd066586e7581952f84a92bc8152248a9be6b2da
+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
+# symbols on dlopen(). See https://github.com/termux/termux-packages/issues/462.
+TERMUX_PKG_DEPENDS="openssl, c-ares"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
 TERMUX_PKG_BUILD_IN_SRC=yes
+TERMUX_PKG_CONFLICTS="nodejs-current"
 
 termux_step_configure () {
-	#XXX: node.js build does not handle already installed headers
-	#     https://github.com/nodejs/node/issues/2637
-	#     So we remove them here and restore afterwards.
-	rm -Rf $TERMUX_PKG_CACHEDIR/gtest-include-dir $TERMUX_PKG_CACHEDIR/ares-includes
-	test -d $TERMUX_PREFIX/include/gtest &&
-		mv $TERMUX_PREFIX/include/gtest $TERMUX_PKG_CACHEDIR/gtest-include-dir
-	test -f $TERMUX_PREFIX/include/ares.h &&
-		mkdir $TERMUX_PKG_CACHEDIR/ares-includes/ &&
-		mv $TERMUX_PREFIX/include/ares* $TERMUX_PKG_CACHEDIR/ares-includes/
-
-	# https://github.com/nodejs/build/issues/266: "V8 can handle cross compiling of
-	# snapshots if the {CC,CXX}_host variables are defined, by compiling the
-	# mksnapshot executable with the host compiler". But this currently fails
-	# due to the host build picking up targets flags.
-	export CC_host=gcc
-	export CXX_host=g++
-
 	if [ $TERMUX_ARCH = "arm" ]; then
 		DEST_CPU="arm"
 	elif [ $TERMUX_ARCH = "i686" ]; then
@@ -34,25 +21,21 @@ termux_step_configure () {
 	elif [ $TERMUX_ARCH = "x86_64" ]; then
 		DEST_CPU="x64"
 	else
-		echo "Unsupported arch: $TERMUX_ARCH"
-		exit 1
+		termux_error_exit "Unsupported arch '$TERMUX_ARCH'"
 	fi
 
-	#LDFLAGS+=" -lstlport_static"
+	export GYP_DEFINES="host_os=linux"
 
+	# See note above TERMUX_PKG_DEPENDS why we do not use a shared libuv.
 	./configure \
 		--prefix=$TERMUX_PREFIX \
 		--dest-cpu=$DEST_CPU \
 		--dest-os=android \
-		--shared-openssl --shared-zlib --shared-libuv \
-		--without-snapshot
-}
-
-termux_step_post_massage () {
-	test -d $TERMUX_PKG_CACHEDIR/gtest-include-dir &&
-		mv $TERMUX_PKG_CACHEDIR/gtest-include-dir $TERMUX_PREFIX/include/gtest
-	test -d $TERMUX_PKG_CACHEDIR/ares-includes &&
-		mv $TERMUX_PKG_CACHEDIR/ares-includes/* $TERMUX_PREFIX/include/
-	# Exit with success to avoid aborting script due to set -e:
-	true
+		--shared-cares \
+		--shared-openssl \
+		--shared-zlib \
+		--without-inspector \
+		--without-intl \
+		--without-snapshot \
+		--cross-compiling
 }