build-package.sh: fix -a all -i builds

Also use `-s -i` for dependencies that have to be built
This commit is contained in:
Henrik Grimler 2019-01-25 22:09:57 +01:00
parent c88cde9ad5
commit 308990a29e

View File

@ -282,7 +282,7 @@ termux_step_handle_arguments() {
# Handle 'all' arch: # Handle 'all' arch:
if [ -n "${TERMUX_ARCH+x}" ] && [ "${TERMUX_ARCH}" = 'all' ]; then if [ -n "${TERMUX_ARCH+x}" ] && [ "${TERMUX_ARCH}" = 'all' ]; then
for arch in 'aarch64' 'arm' 'i686' 'x86_64'; do for arch in 'aarch64' 'arm' 'i686' 'x86_64'; do
./build-package.sh ${TERMUX_FORCE_BUILD+-f} -a $arch \ ./build-package.sh ${TERMUX_FORCE_BUILD+-f} -a $arch ${TERMUX_INSTALL_DEPS+-i} \
${TERMUX_DEBUG+-d} ${TERMUX_DEBDIR+-o $TERMUX_DEBDIR} "$1" ${TERMUX_DEBUG+-d} ${TERMUX_DEBDIR+-o $TERMUX_DEBDIR} "$1"
done done
exit exit
@ -574,7 +574,7 @@ termux_step_start_build() {
fi fi
if ! termux_download_deb $pkg $dep_arch $dep_version; then if ! termux_download_deb $pkg $dep_arch $dep_version; 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"
./build-package.sh -a $TERMUX_ARCH -i "$pkg" ./build-package.sh -a $TERMUX_ARCH -i -s "$pkg"
continue continue
else else
if [ ! "$TERMUX_QUIET_BUILD" = true ]; then echo "Extracting $pkg..."; fi if [ ! "$TERMUX_QUIET_BUILD" = true ]; then echo "Extracting $pkg..."; fi