[arch-commits] Commit in valgrind-multilib/trunk (PKGBUILD)

[Jan Steffens]

    Date: Wednesday, March 8, 2017 @ 18:44:03
  Author: heftig
Revision: 215317

3.12.0-2

Modified:
  valgrind-multilib/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-08 18:36:42 UTC (rev 215316)
+++ PKGBUILD	2017-03-08 18:44:03 UTC (rev 215317)
@@ -4,23 +4,27 @@
 
 pkgname=valgrind-multilib
 pkgver=3.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A tool to help find memory-management problems in programs for multilib'
 arch=(x86_64)
 license=(GPL)
 url='http://valgrind.org/'
-depends=('lib32-glibc>=2.24' 'lib32-glibc<2.25' 'perl')
+depends=('glibc=2.25' 'lib32-glibc=2.25' 'perl')
 makedepends=(gdb openmpi gcc-multilib)
 optdepends=('openmpi: MPI support')
-# valgrind does not like stack protector flags
-options=(!emptydirs !buildflags)
+options=(!emptydirs)
 source=(http://valgrind.org/downloads/valgrind-$pkgver.tar.bz2)
 sha1sums=('7a6878bf998c60d1e377a4f22ebece8d9305bda4')
- 
+
 provides=("valgrind=$pkgver-$pkgrel")
 conflicts=('valgrind')
 
 build() {
+  # valgrind does not like stack protector flags
+  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+  CFLAGS=${CFLAGS/-fstack-protector-strong/}
+  CXXFLAGS=${CXXFLAGS/-fstack-protector-strong/}
+
   cd valgrind-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man --with-mpicc=mpicc
   make