Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-06-08 15:01:24 +0200
committerErich Eckner <git@eckner.net>2019-03-26 15:05:40 +0100
commit9edfdca7020b64e06ecfd6d6c0f70b500a6ff0e7 (patch)
tree26c0703f99c3d946e0c7f11b711e6f81c7fc08d9 /scripts
parentd37e6d40a19dadf41a223dcb1fde36c6fa622958 (diff)
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.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 4f096a36..a76b75a1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1397,18 +1397,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