[pacman-dev] [PATCH 2/2] makepkg: use all deps arrays for finding vcs progs

Dave Reisner dreisner at archlinux.org
Sun Dec 28 17:31:50 UTC 2014


---
 scripts/makepkg.sh.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6565809..acff9b0 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2920,14 +2920,8 @@ check_vcs_software() {
 		return $ret
 	fi
 
-	# we currently only use global depends/makedepends arrays for --syncdeps
-	for attr in depends makedepends; do
-		pkgbuild_get_attribute "$pkg" "$attr" 1 'deps'
-		all_deps+=("${deps[@]}")
-
-		pkgbuild_get_attribute "$pkg" "${attr}_$CARCH" 1 'deps'
-		all_deps+=("${deps[@]}")
-	done
+	all_deps=("${makedepends[@]}")
+	pkgbuild_get_all_for_arch 'depends' "$CARCH" deps && all_deps+=("${deps[@]}")
 
 	get_all_sources_for_arch 'all_sources'
 	for netfile in ${all_sources[@]}; do
-- 
2.2.1


More information about the pacman-dev mailing list