From 3e2d9f269b8f0a531784a7130323535160ee893b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 30 Dec 2012 02:54:08 +0000
Subject: [PATCH] extra/valgrind to 3.8.1-2

---
 extra/valgrind/PKGBUILD                       |  8 +++-
 .../valgrind/valgrind-3.8.1-glibc-2.17.patch  | 37 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 extra/valgrind/valgrind-3.8.1-glibc-2.17.patch

diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index fe2f58c47..549640b79 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -7,21 +7,25 @@
 
 pkgname=valgrind
 pkgver=3.8.1
-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.16' 'glibc<2.17' 'perl')
+depends=('glibc>=2.17' 'glibc<2.18' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.8.1-glibc-2.17.patch
         alarm.patch)
 md5sums=('288758010b271119a0ffc0183f1d6e38'
+         'e87c34f9f9ce0040d141b3bd57842b5c'
          'aba5261d8ef25ab9bbad44631172da02')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch
   
   [ "${CARCH}" = "arm" -o "${CARCH}" = "armv6h" ] && patch -Np1 -i ${srcdir}/alarm.patch
 
diff --git a/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch
new file mode 100644
index 000000000..bfeb9486d
--- /dev/null
+++ b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch
@@ -0,0 +1,37 @@
+diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure
+--- valgrind-3.8.1-orig/configure	2012-09-19 05:19:23.000000000 +1000
++++ valgrind-3.8.1/configure	2012-12-27 08:11:36.645429011 +1000
+@@ -6612,6 +6612,24 @@
+ 
+ 	# DEFAULT_SUPP set by kernel version check above.
+ 	;;
++     2.17)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
++$as_echo "2.17 family" >&6; }
++
++$as_echo "#define GLIBC_2_17 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; }
++
++$as_echo "#define DARWIN_LIBC 1" >>confdefs.h
++
++	# DEFAULT_SUPP set by kernel version check above.
++	;;
+      bionic)
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5
+ $as_echo "Bionic" >&6; }
+@@ -6624,7 +6642,7 @@
+      *)
+ 	{ $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.16" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
+ 	as_fn_error "or Darwin libc" "$LINENO" 5
+ 	;;
+ esac