From 9c646988505055b718517d647681d4f3c40eca98 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 27 Sep 2015 04:11:26 -0300
Subject: pacman-4.2.1-2.parabola3: add archlinuxarm-keyring to depends for
 armv7h and remove --hash-style=gnu from LDFLAGS as this is default in gcc-4.7
 package

---
 libre/pacman/PKGBUILD | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'libre/pacman/PKGBUILD')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 21e10ceae..9c3638017 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=pacman
 pkgver=4.2.1
-pkgrel=2.parabola2
+pkgrel=2.parabola3
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.archlinux.org/pacman/"
@@ -19,6 +19,9 @@ groups=('base' 'base-devel')
 depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring'
          'parabola-keyring' 'ca-certificates-cacert')
+if [ "${CARCH}" = "armv7h" ]; then
+  depends+=('archlinuxarm-keyring')
+fi
 makedepends=('asciidoc')   # roundup patch alters docs
 checkdepends=('python2' 'fakechroot')
 optdepends=('cron: run specified programs at scheduled times and related tools')
@@ -97,7 +100,7 @@ package() {
       myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
       ;;
   esac
-  myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
+  myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
 
   # set things correctly in the default conf file
   install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
-- 
cgit v1.2.3-54-g00ecf