X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a61e7e45560cd92657ba15a752a5dad49875fd23..05b27f3dcde27d1729d0f5ff1e7fffefd59855dd:/disabled-packages/nodejs-current/build.sh

diff --git a/disabled-packages/nodejs-current/build.sh b/disabled-packages/nodejs-current/build.sh
index c6a2be8a..792b7255 100644
--- a/disabled-packages/nodejs-current/build.sh
+++ b/disabled-packages/nodejs-current/build.sh
@@ -1,14 +1,16 @@
+# status: Does not build
 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=7.4.0
+TERMUX_PKG_VERSION=7.10.0
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=69b76c86e6fc9914fa136089d8c28a4828c14aa8792cbdf946090a5a2afd25b6
+TERMUX_PKG_SHA256=c4843fe8bffb59c2327063a5e67a89af60d7927f7ace7548695a2cf4c1aa6d03
 # 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"
 
 termux_step_configure () {
 	# See https://github.com/nodejs/build/issues/266 about enabling snapshots
@@ -20,13 +22,13 @@ termux_step_configure () {
 	# 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
+	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
 		DEST_CPU="arm"
@@ -37,10 +39,11 @@ 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 \
@@ -51,5 +54,5 @@ termux_step_configure () {
 		--shared-zlib \
 		--without-inspector \
 		--without-intl \
-		--without-snapshot
+		--cross-compiling
 }