summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-09-12 15:22:03 +0200
committerAllan McRae <allan@archlinux.org>2019-10-07 08:44:42 +0200
commit095d6332bea6cd44e012927043a89210b1a3f9b3 (patch)
tree193ae1128d527a090d50eb09b31c195e0e63d747
parent8e7d425627c8a6ce102c349020ccf6c5786c7a46 (diff)
downloadpacman-095d6332bea6cd44e012927043a89210b1a3f9b3.tar.gz
pacman-095d6332bea6cd44e012927043a89210b1a3f9b3.tar.xz
makepkg: remove makedepends before installing built package
When running `makepkg -i` it may be necessary to first remove make- and checkdepends before installing the built package - for example if they conflict each other. This is the case for wireguard-arch which makedepends and conflicts wireguard-dkms. Signed-off-by: Erich Eckner <git@eckner.net> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ec2de455..756109cc 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -822,6 +822,9 @@ create_srcpackage() {
install_package() {
(( ! INSTALL )) && return 0
+ remove_deps || return $?
+ RMDEPS=0
+
if (( ! SPLITPKG )); then
msg "$(gettext "Installing package %s with %s...")" "$pkgname" "$PACMAN -U"
else