mirror of
https://github.com/termux/termux-packages
synced 2024-06-14 13:26:42 +00:00
fix(build-package.sh): Ensure dependency packages are force rebuilt as well if -f
is passed
This commit is contained in:
parent
cd2928cbe1
commit
b9b5987319
|
@ -37,7 +37,7 @@ termux_step_get_dependencies() {
|
||||||
|
|
||||||
if ! termux_download_deb_pac $PKG $DEP_ARCH $DEP_VERSION $DEP_VERSION_PAC; then
|
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"
|
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
|
continue
|
||||||
fi
|
fi
|
||||||
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
|
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
|
||||||
|
@ -71,7 +71,7 @@ termux_step_get_dependencies() {
|
||||||
fi
|
fi
|
||||||
echo "Building dependency $PKG if necessary..."
|
echo "Building dependency $PKG if necessary..."
|
||||||
# Built dependencies are put in the default TERMUX_OUTPUT_DIR instead of the specified one
|
# 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")
|
done<<<$(./scripts/buildorder.py "$TERMUX_PKG_BUILDER_DIR" $TERMUX_PACKAGES_DIRECTORIES || echo "ERROR")
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user