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

diff --git a/packages/nodejs-current/build.sh b/packages/nodejs-current/build.sh
index b445bdce..e3a142fc 100644
--- a/packages/nodejs-current/build.sh
+++ b/packages/nodejs-current/build.sh
@@ -1,8 +1,7 @@
-# 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=8.2.1
-TERMUX_PKG_SHA256=66fe1379bc7daf9a16c6b5c45ab695bf1cdcfae9738d2989e940104d6b31973f
+TERMUX_PKG_VERSION=8.7.0
+TERMUX_PKG_SHA256=c7184526e5504fa2a91aff1aacd7c344451da539d73775b6d9ea8efe948d0fa8
 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
@@ -13,23 +12,6 @@ TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFLICTS="nodejs"
 
 termux_step_configure () {
-	# 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
 		DEST_CPU="arm"
 	elif [ $TERMUX_ARCH = "i686" ]; then
@@ -54,12 +36,6 @@ termux_step_configure () {
 		--shared-zlib \
 		--without-inspector \
 		--without-intl \
+		--without-snapshot \
 		--cross-compiling
-
-	# Remove cross-compile directories:
-	sed -i '/usr\/include/d; /usr\/lib/d' out/deps/v8/src/mkpeephole.host.mk
-	# The above statement causes some straggling \ in the makefile:
-	sed -i 's|-I$(srcdir)/deps/v8 \\|-I$(srcdir)/deps/v8|' out/deps/v8/src/mkpeephole.host.mk
-	# Remove extra libraries not needed for mkpeephole:
-	sed -i '/-lcares/d; /-lcrypto/d; /-lssl/d; /-lz/d' out/deps/v8/src/mkpeephole.host.mk
 }