From c2b843a72dc81974252adec491bf1111e767dca7 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Thu, 9 May 2019 22:38:42 +0300 Subject: [PATCH] build-package.sh: break possible circular dependencies --- scripts/build/termux_create_subpackages.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/build/termux_create_subpackages.sh b/scripts/build/termux_create_subpackages.sh index 2cd1baea6..4df114731 100644 --- a/scripts/build/termux_create_subpackages.sh +++ b/scripts/build/termux_create_subpackages.sh @@ -69,10 +69,12 @@ termux_create_subpackages() { Homepage: $TERMUX_PKG_HOMEPAGE HERE - if [ -n "$TERMUX_SUBPKG_DEPENDS" ]; then - echo "Depends: $TERMUX_PKG_NAME (= $TERMUX_PKG_FULLVERSION), $TERMUX_SUBPKG_DEPENDS" >> control - else - echo "Depends: $TERMUX_PKG_NAME (= $TERMUX_PKG_FULLVERSION)" >> control + if ! grep -qwP "[^\w]*${SUB_PKG_NAME}[^\w]*" <(echo "${TERMUX_PKG_DEPENDS}"); then + if [ -n "$TERMUX_SUBPKG_DEPENDS" ]; then + echo "Depends: $TERMUX_PKG_NAME (= $TERMUX_PKG_FULLVERSION), $TERMUX_SUBPKG_DEPENDS" >> control + else + echo "Depends: $TERMUX_PKG_NAME (= $TERMUX_PKG_FULLVERSION)" >> control + fi fi test ! -z "$TERMUX_SUBPKG_BREAKS" && echo "Breaks: $TERMUX_SUBPKG_BREAKS" >> control