X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..f316e99dac50e2e763ea3d97d4bd95daa0a1e86c:/packages/nodejs/build.sh

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 773007db..8f17bbf4 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,29 +1,38 @@
-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=0.12.4
-TERMUX_PKG_SRCURL=http://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--dest-os=android --shared-openssl --shared-zlib --shared-cares --shared-libuv --without-snapshot"
-TERMUX_PKG_DEPENDS="c-ares, openssl, libuv"
+TERMUX_PKG_VERSION=6.11.4
+TERMUX_PKG_SHA256=94557aa1b9adaa71a424eb7efe8877d7e65bda6e496350c4bac5f64ec715bb1c
+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
+# 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 () {
 	if [ $TERMUX_ARCH = "arm" ]; then
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=arm"
+		DEST_CPU="arm"
 	elif [ $TERMUX_ARCH = "i686" ]; then
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=ia32"
+		DEST_CPU="ia32"
+	elif [ $TERMUX_ARCH = "aarch64" ]; then
+		DEST_CPU="arm64"
+	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
-	# Some v8 code checks for ANDROID instead of __ANDROID__:
-	export CFLAGS="$CFLAGS -DANDROID=1"
-	export CXXFLAGS="$CXXFLAGS -DANDROID=1"
-	# The cc_macros() function in configure executes $CC to look at features such as armv7 and neon:
-	export CC="$CC $CFLAGS"
-	# To avoid build process trying to use linux-specific flock which breaks build on mac:
-	export LINK=$CXX
-	env $TERMUX_PKG_SRCDIR/configure \
+
+	# See note above TERMUX_PKG_DEPENDS why we do not use a shared libuv.
+	./configure \
 		--prefix=$TERMUX_PREFIX \
-		${TERMUX_PKG_EXTRA_CONFIGURE_ARGS}
+		--dest-cpu=$DEST_CPU \
+		--dest-os=android \
+		--shared-cares \
+		--shared-openssl \
+		--shared-zlib \
+		--without-inspector \
+		--without-intl \
+		--without-snapshot
 }