nodejs: Cleanup and prepare for snapshots

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 97f1137..da514b7 100644 (file)
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -11,17 +11,25 @@ TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_configure () {
-       # 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++
+       # 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
 
-       local _EXTRA_CONFIGURE_ARGS=""
        if [ $TERMUX_ARCH = "arm" ]; then
                DEST_CPU="arm"
-               _EXTRA_CONFIGURE_ARGS=" --with-arm-float-abi=hard --with-arm-fpu=neon"
        elif [ $TERMUX_ARCH = "i686" ]; then
                DEST_CPU="ia32"
        elif [ $TERMUX_ARCH = "aarch64" ]; then
@@ -33,13 +41,15 @@ termux_step_configure () {
                exit 1
        fi
 
+       # 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-openssl --shared-zlib --shared-cares \
-               --without-snapshot \
-               --without-intl \
+               --shared-cares \
+               --shared-openssl \
+               --shared-zlib \
                --without-inspector \
-               $_EXTRA_CONFIGURE_ARGS
+               --without-intl \
+               --without-snapshot
 }