sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run termux_setup_ninja if TERMUX_CMAKE_BUILD=Ninja

Browse Source 
Also drop TERMUX_PKG_EXTRA_NINJA_ARGS for now, it can be added back if
desired.
This commit is contained in:
Fredrik Fornwall 2018-08-21 01:00:59 +02:00
parent 542fbbd197
commit f1e9f33727
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-package.sh
View File

@ -308,7 +308,6 @@ termux_step_setup_variables() {
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=""
TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS=""
TERMUX_PKG_EXTRA_MAKE_ARGS=""
TERMUX_PKG_EXTRA_NINJA_ARGS=""
TERMUX_PKG_BUILD_IN_SRC=""
TERMUX_PKG_RM_AFTER_INSTALL=""
TERMUX_PKG_BREAKS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
@ -924,7 +923,10 @@ termux_step_configure_cmake () {
local CMAKE_PROC=$TERMUX_ARCH
test $CMAKE_PROC == "arm" && CMAKE_PROC='armv7-a'
local MAKE_PROGRAM_PATH=`which make`
if [ $TERMUX_CMAKE_BUILD = Ninja ]; then MAKE_PROGRAM_PATH=`which ninja`; fi
if [ $TERMUX_CMAKE_BUILD = Ninja ]; then
termux_setup_ninja
MAKE_PROGRAM_PATH=`which ninja`
fi
# XXX: CMAKE_{AR,RANLIB} needed for at least jsoncpp build to not
# pick up cross compiled binutils tool in $PREFIX/bin:
@ -990,12 +992,8 @@ termux_step_make() {
else
make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD ${TERMUX_PKG_EXTRA_MAKE_ARGS}
fi
elif test -f build.ninja || [ ! -z "$TERMUX_PKG_EXTRA_NINJA_ARGS" ]; then
if [ -z "$TERMUX_PKG_EXTRA_NINJA_ARGS" ]; then
ninja -j $TERMUX_MAKE_PROCESSES
else
ninja -j $TERMUX_MAKE_PROCESSES ${TERMUX_PKG_EXTRA_NINJA_ARGS}
fi
elif test -f build.ninja; then
ninja -j $TERMUX_MAKE_PROCESSES
fi
}