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

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 0e6a1d50..a1deaf74 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,29 +1,54 @@
 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.2
+TERMUX_PKG_VERSION=6.9.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"
+# 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_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*}
+	# See https://github.com/nodejs/build/issues/266 about enabling snapshots
+	# when cross compiling. We use {CC,CXX}_host for compilation of code to
+	# be run on the build maching (snapshots when cross compiling are
+	# generated using a CPU emulator provided by v8) and {CC,CXX} for the
+	# cross compile. We unset flags such as CFLAGS as they would affect
+	# both the host and cross compiled build.
+	# Remaining issue to be solved before enabling snapshots by removing
+	# the --without-snapshot flag is that pkg-config picks up cross compilation
+	# flags which breaks the host build.
+	#export CC_host="gcc -pthread"
+	#export CXX_host="g++ -pthread"
+	#export CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS"
+	#export CXX="$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS"
+	#export CFLAGS="-Os"
+	#export CXXFLAGS="-Os"
+	#unset CPPFLAGS LDFLAGS
 
 	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
-		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}
+	# 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-cares \
+		--shared-openssl \
+		--shared-zlib \
+		--without-inspector \
+		--without-intl \
+		--without-snapshot
 }