From 672f5af92b329bb38d8e1be77057c712f1c54996 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 13 Aug 2017 17:19:26 +0000 Subject: [PATCH] core/pacman to 5.0.2-2.1 --- core/pacman/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 940a6cc69..7da930543 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -6,13 +6,13 @@ # ALARM: Kevin Mihelich # - arch/host/flags for arm, armv6h, armv7h, and aarch64 # - pacman.conf: architecture=arm/armv6h/armv7h/aarch64, added our aur and alarm repos -# - makepkg.conf: adjusted C/CXX/LDFLAGS +# - makepkg.conf: adjusted C/CXX/LDFLAGS, drop -z,now for armv5 # - patch to sync filesystem after install/remove # - reverts to allow scriplet input on stdin pkgname=pacman pkgver=5.0.2 -pkgrel=2 +pkgrel=2.1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" @@ -107,6 +107,7 @@ package() { -e "s|@CHOST[@]|$mychost|g" \ -e "s|@CARCHFLAGS[@]|$myflags|g" sed -i $pkgdir/etc/pacman.conf -e "s|@CARCH[@]|$mycarch|g" + [[ $CARCH == "arm" ]] && sed -i 's/,-z,now//' "$pkgdir/etc/makepkg.conf" # put bash_completion in the right location install -dm755 "$pkgdir/usr/share/bash-completion/completions"