From 45fc6e15e7a0ec52eaf13292a53b1ab481ecd23b Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Thu, 15 Aug 2019 00:03:58 +0300 Subject: [PATCH] build-package.sh: fix detection of static libraries when creating subpackages Now packages will be split if static libraries are located in subdirectory of $PREFIX/lib. --- scripts/build/termux_create_subpackages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/termux_create_subpackages.sh b/scripts/build/termux_create_subpackages.sh index df503f4e0..6094d7fae 100644 --- a/scripts/build/termux_create_subpackages.sh +++ b/scripts/build/termux_create_subpackages.sh @@ -1,6 +1,6 @@ termux_create_subpackages() { # Sub packages: - if [ "$TERMUX_PKG_NO_STATICSPLIT" = "false" ] && [[ -n $(shopt -s nullglob; echo lib/*.a) ]]; then + if [ "$TERMUX_PKG_NO_STATICSPLIT" = "false" ] && [[ -n $(shopt -s globstar; shopt -s nullglob; echo lib/**/*.a) ]]; then # Add virtual -static sub package if there are include files: local _STATIC_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-static.subpackage.sh echo TERMUX_SUBPKG_INCLUDE=\"lib/**/*.a lib/**/*.la\" > "$_STATIC_SUBPACKAGE_FILE"