[pacman-dev] [PATCH] makedeps and checkdeps are now installed together

awhetter.2011 at my.bristol.ac.uk awhetter.2011 at my.bristol.ac.uk
Fri Jul 12 06:06:38 EDT 2013


From: Ashley Whetter <awhetter.2011 at my.bristol.ac.uk>

Fixes FS#31557

Signed-off-by: Ashley Whetter <awhetter.2011 at my.bristol.ac.uk>
---
 scripts/makepkg.sh.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 2a39157..06f7c25 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2952,10 +2952,10 @@ else
 	fi
 
 	msg "$(gettext "Checking buildtime dependencies...")"
-	resolve_deps ${makedepends[@]} || deperr=1
-
 	if (( CHECKFUNC )); then
-		resolve_deps ${checkdepends[@]} || deperr=1
+		resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1
+	else
+		resolve_deps "${makedepends[@]}" || deperr=1
 	fi
 
 	if (( RMDEPS )); then
-- 
1.8.3.2



More information about the pacman-dev mailing list