Browse Source

nodejs: Restore c-ares and gtest include files

Due to a bug in nodejs [1] we have to remove the c-ares and gtest
include files before building. Improve this to restore them after
building to prevent build breakage if building a package requiring
these afterwards.

[1] https://github.com/nodejs/node/issues/2637
android-5
Fredrik Fornwall 9 years ago
parent
commit
d53dc64470
  1. 19
      packages/nodejs/build.sh

19
packages/nodejs/build.sh

@ -8,9 +8,15 @@ 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 () {
#FIXME: node.js build does not handle already installed headers #XXX: node.js build does not handle already installed headers
# https://github.com/nodejs/node/issues/2637 # https://github.com/nodejs/node/issues/2637
rm -Rf $TERMUX_PREFIX/{include/gtest/,/include/ares*} # So we remove them here and restore afterwards.
rm -Rf $TERMUX_PKG_CACHEDIR/gtest-include-dir $TERMUX_PKG_CACHEDIR/ares-includes
test -d $TERMUX_PREFIX/include/gtest &&
mv $TERMUX_PREFIX/include/gtest $TERMUX_PKG_CACHEDIR/gtest-include-dir
test -f $TERMUX_PREFIX/include/ares.h &&
mkdir $TERMUX_PKG_CACHEDIR/ares-includes/ &&
mv $TERMUX_PREFIX/include/ares* $TERMUX_PKG_CACHEDIR/ares-includes/
if [ $TERMUX_ARCH = "arm" ]; then if [ $TERMUX_ARCH = "arm" ]; then
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=arm" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --dest-cpu=arm"
@ -27,3 +33,10 @@ termux_step_configure () {
./configure --prefix=$TERMUX_PREFIX ${TERMUX_PKG_EXTRA_CONFIGURE_ARGS} ./configure --prefix=$TERMUX_PREFIX ${TERMUX_PKG_EXTRA_CONFIGURE_ARGS}
} }
termux_step_post_massage () {
test -d $TERMUX_PKG_CACHEDIR/gtest-include-dir &&
mv $TERMUX_PKG_CACHEDIR/gtest-include-dir $TERMUX_PREFIX/include/gtest
test -d $TERMUX_PKG_CACHEDIR/ares-includes &&
mv $TERMUX_PKG_CACHEDIR/ares-includes/* $TERMUX_PREFIX/include/
}

Loading…
Cancel
Save