From 8136ebd9223515801fd73cfdf26cd423ee8a7fb2 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Fri, 18 Jul 2025 09:41:08 +0000 Subject: [PATCH] Update repo --- scripts/build/configure/termux_step_configure.sh | 2 +- scripts/build/termux_step_make.sh | 2 +- scripts/build/termux_step_make_install.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/configure/termux_step_configure.sh b/scripts/build/configure/termux_step_configure.sh index 72729ea7ee..9957509ac9 100644 --- a/scripts/build/configure/termux_step_configure.sh +++ b/scripts/build/configure/termux_step_configure.sh @@ -3,7 +3,7 @@ termux_step_configure() { # This check should be above autotools check as haskell package too makes use of configure scripts which # should be executed by its own build system. - if ls "${TERMUX_PKG_SRCDIR}"/*.cabal &>/dev/null; then + if ls "${TERMUX_PKG_SRCDIR}"/*.cabal &>/dev/null || ls "${TERMUX_PKG_SRCDIR}"/cabal.project &>/dev/null; then [ "$TERMUX_CONTINUE_BUILD" == "true" ] && return termux_step_configure_cabal elif [ "$TERMUX_PKG_FORCE_CMAKE" = "false" ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then diff --git a/scripts/build/termux_step_make.sh b/scripts/build/termux_step_make.sh index 85aa6b9429..36f44a70f4 100644 --- a/scripts/build/termux_step_make.sh +++ b/scripts/build/termux_step_make.sh @@ -8,7 +8,7 @@ termux_step_make() { if test -f build.ninja; then ninja -j $TERMUX_PKG_MAKE_PROCESSES - elif ls ./*.cabal &>/dev/null; then + elif ls ./*.cabal &>/dev/null || ls ./cabal.project &>/dev/null; then cabal --config="$TERMUX_CABAL_CONFIG" build elif ls ./*akefile &>/dev/null || [ ! -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then diff --git a/scripts/build/termux_step_make_install.sh b/scripts/build/termux_step_make_install.sh index e410f6e1c4..b6d4555b27 100644 --- a/scripts/build/termux_step_make_install.sh +++ b/scripts/build/termux_step_make_install.sh @@ -6,7 +6,7 @@ termux_step_make_install() { ninja -j $TERMUX_PKG_MAKE_PROCESSES install elif test -f setup.py || test -f pyproject.toml || test -f setup.cfg; then pip install --no-deps . --prefix $TERMUX_PREFIX - elif ls ./*.cabal &>/dev/null; then + elif ls ./*.cabal &>/dev/null || ls ./cabal.project &>/dev/null; then # Workaround until `cabal install` is fixed. while read -r bin; do [[ -f "$bin" ]] || termux_error_exit "'$bin', no such file. Has build completed?"