From 44a41a2bc090a29dad2ccd786a72fd464df92d71 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 23 Feb 2019 11:14:02 +0100 Subject: [PATCH] build-package.sh: handle | in TERMUX_PKG_DEPENDS when fast building --- build-package.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build-package.sh b/build-package.sh index 1592a1329e..0b2d1db3fd 100755 --- a/build-package.sh +++ b/build-package.sh @@ -568,10 +568,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 - # remove (>= 1.0) and similar version tags with sed: - _PKG_DEPENDS=$(echo ${TERMUX_PKG_DEPENDS//,/ } | sed "s/[(][^)]*[)]//g") - _PKG_BUILD_DEPENDS=${TERMUX_PKG_BUILD_DEPENDS//,/ } - for pkg in $_PKG_DEPENDS $_PKG_BUILD_DEPENDS; do + # remove (>= 1.0) and similar version tags: + _PKG_DEPENDS=$(echo ${TERMUX_PKG_DEPENDS// /} | sed "s/[(][^)]*[)]//g") + _PKG_BUILD_DEPENDS=${TERMUX_PKG_BUILD_DEPENDS// /} + for pkg in ${_PKG_DEPENDS//,/ } ${_PKG_BUILD_DEPENDS//,/ }; do + # handle "or" in dependencies (use first one): + if [ ! "$pkg" = "${pkg/|/}" ]; then pkg=$(echo "$pkg" | sed "s%|.*%%"); fi # llvm doesn't build if ndk-sysroot is installed: if [ "$pkg" = "ndk-sysroot" ]; then continue; fi read dep_arch dep_version <<< $(termux_extract_dep_info "$pkg")