nodejs: Cleanup and prepare for snapshots

This commit is contained in:
Fredrik Fornwall 2016-09-22 17:59:43 -04:00
parent 96fed5a72e
commit 7e49911aab
1 changed files with 22 additions and 12 deletions

View File

@ -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_PKG_BUILD_IN_SRC=yes
termux_step_configure () { termux_step_configure () {
# https://github.com/nodejs/build/issues/266: "V8 can handle cross compiling of # See https://github.com/nodejs/build/issues/266 about enabling snapshots
# snapshots if the {CC,CXX}_host variables are defined, by compiling the # when cross compiling. We use {CC,CXX}_host for compilation of code to
# mksnapshot executable with the host compiler". But this currently fails # be run on the build maching (snapshots when cross compiling are
# due to the host build picking up targets flags. # generated using a CPU emulator provided by v8) and {CC,CXX} for the
export CC_host=gcc # cross compile. We unset flags such as CFLAGS as they would affect
export CXX_host=g++ # 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 if [ $TERMUX_ARCH = "arm" ]; then
DEST_CPU="arm" DEST_CPU="arm"
_EXTRA_CONFIGURE_ARGS=" --with-arm-float-abi=hard --with-arm-fpu=neon"
elif [ $TERMUX_ARCH = "i686" ]; then elif [ $TERMUX_ARCH = "i686" ]; then
DEST_CPU="ia32" DEST_CPU="ia32"
elif [ $TERMUX_ARCH = "aarch64" ]; then elif [ $TERMUX_ARCH = "aarch64" ]; then
@ -33,13 +41,15 @@ termux_step_configure () {
exit 1 exit 1
fi fi
# See note above TERMUX_PKG_DEPENDS why we do not use a shared libuv.
./configure \ ./configure \
--prefix=$TERMUX_PREFIX \ --prefix=$TERMUX_PREFIX \
--dest-cpu=$DEST_CPU \ --dest-cpu=$DEST_CPU \
--dest-os=android \ --dest-os=android \
--shared-openssl --shared-zlib --shared-cares \ --shared-cares \
--without-snapshot \ --shared-openssl \
--without-intl \ --shared-zlib \
--without-inspector \ --without-inspector \
$_EXTRA_CONFIGURE_ARGS --without-intl \
--without-snapshot
} }