From 7fbb16f59aed5abf8163f5d466510f04313cab85 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 26 Feb 2019 00:35:37 +0200 Subject: [PATCH] Revert "build-package.sh: fix fast-build failure in case subpackages are not defined" --- build-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-package.sh b/build-package.sh index 87afd6b91..ca9cb5d74 100755 --- a/build-package.sh +++ b/build-package.sh @@ -566,12 +566,12 @@ termux_step_start_build() { if [ "$TERMUX_SKIP_DEPCHECK" = false ] && [ "$TERMUX_INSTALL_DEPS" = true ]; then # Download dependencies - local PKG DEP_ARCH DEP_VERSION DEB_FILE _PKG_DEPENDS _PKG_BUILD_DEPENDS _SUBPKG_DEPENDS="" + local PKG DEP_ARCH DEP_VERSION DEB_FILE _PKG_DEPENDS _PKG_BUILD_DEPENDS _SUBPKG_DEPENDS # remove (>= 1.0) and similar version tags: _PKG_DEPENDS=$(echo ${TERMUX_PKG_DEPENDS// /} | sed "s/[(][^)]*[)]//g") _PKG_BUILD_DEPENDS=${TERMUX_PKG_BUILD_DEPENDS// /} # Also download subpackages dependencies (except the mother package): - for SUBPKG in $(find packages/$TERMUX_PKG_NAME -mindepth 1 -maxdepth 1 -type f -iname \*.subpackage.sh); do + for SUBPKG in packages/$TERMUX_PKG_NAME/*.subpackage.sh; do _SUBPKG_DEPENDS+=" $(. $SUBPKG; echo $TERMUX_SUBPKG_DEPENDS | sed s%$TERMUX_PKG_NAME%%g)" done for PKG in $(echo ${_PKG_DEPENDS//,/ } ${_SUBPKG_DEPENDS//,/ } ${_PKG_BUILD_DEPENDS//,/ } | tr ' ' '\n' | sort -u); do