From d0db5e647bdf8a1fbc4ba3a1ea8dabdd63ff90e8 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 27 Feb 2019 19:49:39 +0100 Subject: [PATCH] build-package: mv termux_step_make to scripts/build/ --- build-package.sh | 18 ++---------------- scripts/build/termux_step_make.sh | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 scripts/build/termux_step_make.sh diff --git a/build-package.sh b/build-package.sh index 2961b69ec..74939021f 100755 --- a/build-package.sh +++ b/build-package.sh @@ -91,22 +91,8 @@ termux_step_post_configure() { return } -termux_step_make() { - local QUIET_BUILD= - if [ $TERMUX_QUIET_BUILD = true ]; then - QUIET_BUILD="-s" - fi - - if test -f build.ninja; then - ninja -w dupbuild=warn -j $TERMUX_MAKE_PROCESSES - elif ls ./*akefile &> /dev/null || [ ! -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then - if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then - make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD - else - make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD ${TERMUX_PKG_EXTRA_MAKE_ARGS} - fi - fi -} +# Make package, either with ninja or make +source scripts/build/termux_step_make.sh termux_step_make_install() { if test -f build.ninja; then diff --git a/scripts/build/termux_step_make.sh b/scripts/build/termux_step_make.sh new file mode 100644 index 000000000..1d9a5e618 --- /dev/null +++ b/scripts/build/termux_step_make.sh @@ -0,0 +1,16 @@ +termux_step_make() { + local QUIET_BUILD= + if [ $TERMUX_QUIET_BUILD = true ]; then + QUIET_BUILD="-s" + fi + + if test -f build.ninja; then + ninja -w dupbuild=warn -j $TERMUX_MAKE_PROCESSES + elif ls ./*akefile &> /dev/null || [ ! -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then + if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then + make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD + else + make -j $TERMUX_MAKE_PROCESSES $QUIET_BUILD ${TERMUX_PKG_EXTRA_MAKE_ARGS} + fi + fi +}