X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/b2e5e1aa5b9469b49c2986407495d73b3706eefe..83bb5061aeb205421de52d80ab16f2d852249001:/packages/nodejs/build.sh

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index b5c1e0d2..070c7d37 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,23 +1,20 @@
-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.5.0
-TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="openssl, libuv, c-ares"
+TERMUX_PKG_VERSION=8.9.0
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=ae8258f89e127a76d4b4aff6fdb8dc395b7da0069cba054b913dfc36b3c91189
+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 () {
-	# 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++
-
-	local _EXTRA_CONFIGURE_ARGS=""
 	if [ $TERMUX_ARCH = "arm" ]; then
 		DEST_CPU="arm"
-		_EXTRA_CONFIGURE_ARGS=" --with-arm-float-abi=hard --with-arm-fpu=neon"
 	elif [ $TERMUX_ARCH = "i686" ]; then
 		DEST_CPU="ia32"
 	elif [ $TERMUX_ARCH = "aarch64" ]; then
@@ -25,16 +22,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
 
+	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 --shared-cares \
-		--without-snapshot \
+		--shared-cares \
+		--shared-openssl \
+		--shared-zlib \
+		--without-inspector \
 		--without-intl \
-		$_EXTRA_CONFIGURE_ARGS
+		--without-snapshot \
+		--cross-compiling
 }