From 5290c2a8393fcff3b4e299243592a75659b1855a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 25 Aug 2014 17:43:08 +0200 Subject: [PATCH] xbps-src: change order of how subpackages are processed. 10 Non development packages are processed first lexically. 20 Development packages are processed after 10. This resolves the issue of 32bit pkg creation with development pkgs that depend on other non-development subpkgs, and result in wrong dependencies being propagated to the 32bit development pkgs. --- common/xbps-src/shutils/common.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index a3cbe5bde0e..e9343d3e181 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -195,8 +195,13 @@ get_subpkgs() { while [ $# -gt 0 ]; do list+=" ${3%_package}"; shift 3 done + # first all non development pkgs ... for f in ${list}; do - echo "$f" + [[ $f =~ '-devel' ]] || echo "$f" + done + # ... and then only development pkgs + for f in ${list}; do + [[ $f =~ '-devel' ]] && echo "$f" done }