From cda05ec3a5a0986d4f393907f6445ccaae2240dd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 8 Jul 2012 13:33:47 -0400
Subject: [PATCH] extra/valgrind to 3.7.0-3

---
 extra/valgrind/PKGBUILD                         | 17 ++++++-----------
 ...15.patch => valgrind-3.7.0-glibc-2.16.patch} | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 13 deletions(-)
 rename extra/valgrind/{valgrind-3.7.0-glibc-2.15.patch => valgrind-3.7.0-glibc-2.16.patch} (71%)

diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index bbc15d5ac..3ac7d0666 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -7,24 +7,25 @@
 
 pkgname=valgrind
 pkgver=3.7.0
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('glibc>=2.15' 'glibc<2.16' 'perl')
+depends=('glibc>=2.16' 'glibc<2.17' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.7.0-glibc-2.15.patch
+        valgrind-3.7.0-glibc-2.16.patch
         alarm.patch)
 md5sums=('a855fda56edf05614f099dca316d1775'
-         'f534b79b358cdced0319b375aafde4d5')
+         '8362c9c10b8d7d08d1be628a717cfba7'
+         '09895dece4b831ceb80285c2175ae937')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
-  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
   [ "${CARCH}" = "arm" ] && patch -Np1 -i ${srcdir}/alarm.patch
 
   if [ "${CARCH}" = "x86_64" ]; then
@@ -39,9 +40,3 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
-md5sums=('a855fda56edf05614f099dca316d1775'
-         'f534b79b358cdced0319b375aafde4d5'
-         '7bf89df97efe2ab34efcc8ee8e33ddd7')
-md5sums=('a855fda56edf05614f099dca316d1775'
-         'f534b79b358cdced0319b375aafde4d5'
-         '09895dece4b831ceb80285c2175ae937')
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
similarity index 71%
rename from extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
rename to extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
index fa400b953..4d28ff11a 100644
--- a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
+++ b/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
@@ -1,7 +1,7 @@
 diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
 --- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
 +++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,17 @@
+@@ -6402,6 +6402,28 @@
  	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  	;;
@@ -15,6 +15,17 @@ diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
 +	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
 +	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
 +	;;
++
++     2.16)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5
++$as_echo "2.16 family" >&6; }
++
++$as_echo "#define GLIBC_2_16 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
@@ -24,7 +35,7 @@ diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
  $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
 -	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
  	as_fn_error "or Darwin libc" "$LINENO" 5
  	;;
  esac