From b9b5987319e6df8a9de1a15cf3a0d2c22befcb27 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Fri, 22 Jul 2022 19:01:04 +0500 Subject: [PATCH] fix(build-package.sh): Ensure dependency packages are force rebuilt as well if `-f` is passed --- scripts/build/termux_step_get_dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/termux_step_get_dependencies.sh b/scripts/build/termux_step_get_dependencies.sh index cfd9087fa8..1b5e90a11d 100644 --- a/scripts/build/termux_step_get_dependencies.sh +++ b/scripts/build/termux_step_get_dependencies.sh @@ -37,7 +37,7 @@ termux_step_get_dependencies() { if ! termux_download_deb_pac $PKG $DEP_ARCH $DEP_VERSION $DEP_VERSION_PAC; then echo "Download of $PKG@$DEP_VERSION from $TERMUX_REPO_URL failed, building instead" - TERMUX_BUILD_IGNORE_LOCK=true ./build-package.sh -I --format $TERMUX_PACKAGE_FORMAT "${PKG_DIR}" + TERMUX_BUILD_IGNORE_LOCK=true ./build-package.sh ${TERMUX_FORCE_BUILD+-f} -I --format $TERMUX_PACKAGE_FORMAT "${PKG_DIR}" continue fi if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then @@ -71,7 +71,7 @@ termux_step_get_dependencies() { fi echo "Building dependency $PKG if necessary..." # Built dependencies are put in the default TERMUX_OUTPUT_DIR instead of the specified one - TERMUX_BUILD_IGNORE_LOCK=true ./build-package.sh -s --format $TERMUX_PACKAGE_FORMAT "${PKG_DIR}" + TERMUX_BUILD_IGNORE_LOCK=true ./build-package.sh ${TERMUX_FORCE_BUILD+-f} -s --format $TERMUX_PACKAGE_FORMAT "${PKG_DIR}" done<<<$(./scripts/buildorder.py "$TERMUX_PKG_BUILDER_DIR" $TERMUX_PACKAGES_DIRECTORIES || echo "ERROR") fi }