From 4dd92a6b661a2b2628742db70067aa0529ae7d34 Mon Sep 17 00:00:00 2001
From: Msnuel <manutortosa@chakra-project.org>
Date: Fri, 26 Apr 2013 18:51:06 +0000
Subject: [PATCH] Rebuild against new glibc

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

diff --git a/valgrind/PKGBUILD b/valgrind/PKGBUILD
index fb63d08d4..0024d647a 100644
--- a/valgrind/PKGBUILD
+++ b/valgrind/PKGBUILD
@@ -1,24 +1,31 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
 # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=valgrind
 pkgver=3.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('x86_64')
 license=('GPL')
 url="http://valgrind.org/"
-depends=('glibc>=2.15' 'glibc<2.16' 'perl')
+depends=('glibc>=2.17' 'glibc<2.18' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('288758010b271119a0ffc0183f1d6e38')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.8.1-glibc-2.17.patch)
+md5sums=('288758010b271119a0ffc0183f1d6e38'
+         'e87c34f9f9ce0040d141b3bd57842b5c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+
+  patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
+  else
+    ./configure --prefix=/usr --mandir=/usr/share/man
+  fi
+
   make
 }
 
diff --git a/valgrind/valgrind-3.8.1-glibc-2.17.patch b/valgrind/valgrind-3.8.1-glibc-2.17.patch
new file mode 100644
index 000000000..bfeb9486d
--- /dev/null
+++ b/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