abuild: filter_deps function

1 files changed, 13 insertions, 17 deletions

diff --git a/abuild.in b/abuild.in
index 05e916f..3528b79 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1966,28 +1966,24 @@ trace_makedepends() {
 	'
 }
 
-calcdeps() {
-	builddeps=
-	hostdeps=
+filter_deps() {
+	local d= i
+	for i in $*; do
+		[ "$pkgname" = "${i%%[<>=]*}" ] && continue
+		list_has $i $d && continue
+		subpackages_has ${i%%[<>=]*} || d="$d $i"
+	done
+	echo $d
+}
 
+calcdeps() {
 	if cross_compiling && [ -n "$makedepends_build" -o -n "$makedepends_host" ]; then
-		for i in $EXTRADEPENDS_BUILD $1 $makedepends_build; do
-			list_has $i $hostdeps && continue
-			builddeps="$builddeps $i"
-		done
-		for i in $EXTRADEPENDS_HOST $EXTRADEPENDS_TARGET $makedepends_host; do
-			[ "$pkgname" = "${i%%[<>=]*}" ] && continue
-			list_has $i $hostdeps && continue
-			subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
-		done
+		builddeps=$(filter_deps $EXTRADEPENDS_BUILD $1 $makedepends_build)
+		hostdeps=$(filter_deps $EXTRADEPENDS_HOST $EXTRADEPENDS_TARGET $makedepends_host)
 	else
 		[ -z "$makedepends" ] && makedepends="$makedepends_build $makedepends_host"
 		want_check && makedepends="$makedepends $checkdepends"
-		for i in $EXTRADEPENDS_BUILD $EXTRADEPENDS_HOST $1 $depends $makedepends; do
-			[ "$pkgname" = "${i%%[<>=]*}" ] && continue
-			list_has $i $builddeps && continue
-			subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
-		done
+		builddeps=$(filter_deps $EXTRADEPENDS_BUILD $EXTRADEPENDS_HOST $1 $depends $makedepends)
 		hostdeps="$EXTRADEPENDS_TARGET"
 	fi
 }