From 9da9a9013a638ff897602f577e42902a568320fe Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 10 Feb 2014 04:08:27 +0000
Subject: [PATCH] extra/valgrind to 3.9.0-2

---
 extra/valgrind/PKGBUILD                       | 20 +++++++---
 .../valgrind/valgrind-3.9.0-glibc-2.19.patch  | 37 +++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 extra/valgrind/valgrind-3.9.0-glibc-2.19.patch

diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 1eadb44b1..488fba7f9 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -5,26 +5,36 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch to fix building on armv5 and armv6
 
+noautobuild=1
+
 pkgname=valgrind
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('glibc>=2.18' 'glibc<2.19' 'perl')
+depends=('glibc>=2.19' 'glibc<2.20' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        alarm.patch)
+        alarm.patch
+        valgrind-3.9.0-glibc-2.19.patch)
 md5sums=('0947de8112f946b9ce64764af7be6df2'
-         '65adc9cf0035ff8598f9997754527d64')
+         '65adc9cf0035ff8598f9997754527d64'
+         '21020338ad5a93e6f9694946183e8835')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   [ "${CARCH}" = "arm" -o "${CARCH}" = "armv6h" ] && patch -Np1 -i ${srcdir}/alarm.patch
 
+  patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.19.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   if [[ ${CARCH} = "x86_64" ]]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
   else
diff --git a/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch b/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch
new file mode 100644
index 000000000..79a3283c9
--- /dev/null
+++ b/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch
@@ -0,0 +1,37 @@
+diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
+--- valgrind-3.9.0-orig/configure	2013-11-01 09:33:32.000000000 +1000
++++ valgrind-3.9.0/configure	2014-02-08 09:28:06.063248544 +1000
+@@ -6689,6 +6689,16 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
++$as_echo "2.19 family" >&6; }
++
++$as_echo "#define GLIBC_2_19 1" >>confdefs.h
++
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
+--- valgrind-3.9.0-orig/configure.ac	2013-11-01 09:28:16.000000000 +1000
++++ valgrind-3.9.0/configure.ac	2014-02-08 09:27:38.870385366 +1000
+@@ -918,6 +918,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.19)
++	AC_MSG_RESULT(2.19 family)
++	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])