makepkg: install all dependencies simultanously, if possible

when using rmdeps but not install, runtime dependencies do not
need special handling for (non)removal, and can be installed in the
same transaction. This allows pacman to intelligently resolve some
things which would otherwise be conflicts.

1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 7fa791e1..3caf00f7 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1377,18 +1377,18 @@ else
 	fi
 	deperr=0
 
-	msg "$(gettext "Checking runtime dependencies...")"
-	resolve_deps ${depends[@]} || deperr=1
-
 	if (( RMDEPS && INSTALL )); then
+		msg "$(gettext "Checking runtime dependencies...")"
+		resolve_deps ${depends[@]} || deperr=1
+
 		original_pkglist=($(run_pacman -Qq))    # required by remove_dep
 	fi
 
 	msg "$(gettext "Checking buildtime dependencies...")"
 	if (( CHECKFUNC )); then
-		resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1
+		resolve_deps "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}" || deperr=1
 	else
-		resolve_deps "${makedepends[@]}" || deperr=1
+		resolve_deps "${depends[@]}" "${makedepends[@]}" || deperr=1
 	fi
 
 	if (( RMDEPS )); then