From 2b01f8de5734f3c506e30762428c8da860b13aa7 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 8 Jun 2018 15:01:24 +0200
Subject: 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.

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

(limited to 'scripts/makepkg.sh.in')

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e58edfa1..d1f180ed 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1386,18 +1386,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
-- 
cgit v1.2.3-70-g09d2