X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/b2e4b4145bebec01ec65c284b39d86d976af2da4..30df3f87e0ae3e0926a14633ad37ef867415041c:/packages/nodejs/build.sh

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 931539cb..c8f6bfab 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,29 +1,39 @@
 TERMUX_PKG_HOMEPAGE=http://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
-TERMUX_PKG_VERSION=4.2.3
+TERMUX_PKG_VERSION=6.1.0
 TERMUX_PKG_SRCURL=https://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-libuv"
-TERMUX_PKG_DEPENDS="openssl, libuv"
+TERMUX_PKG_DEPENDS="openssl, libuv, libgnustl, 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_step_configure () {
-	#FIXME: node.js build does not handle already installed headers
-	#       https://github.com/nodejs/node/issues/2637
-	rm -Rf $TERMUX_PREFIX/{include/gtest/,/include/ares*}
+	# 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
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=arm"
+		DEST_CPU="arm"
+		_EXTRA_CONFIGURE_ARGS=" --with-arm-float-abi=hard --with-arm-fpu=neon"
 	elif [ $TERMUX_ARCH = "i686" ]; then
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=ia32"
+		DEST_CPU="ia32"
 	elif [ $TERMUX_ARCH = "aarch64" ]; then
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=arm64"
+		DEST_CPU="arm64"
 	elif [ $TERMUX_ARCH = "x86_64" ]; then
-		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=x64"
+		DEST_CPU="x64"
 	else
 		echo "Unsupported arch: $TERMUX_ARCH"
 		exit 1
 	fi
 
-	./configure --prefix=$TERMUX_PREFIX ${TERMUX_PKG_EXTRA_CONFIGURE_ARGS}
+	./configure \
+		--prefix=$TERMUX_PREFIX \
+		--dest-cpu=$DEST_CPU \
+		--dest-os=android \
+		--shared-openssl --shared-zlib --shared-libuv --shared-cares \
+		--without-snapshot \
+		$_EXTRA_CONFIGURE_ARGS
 }