From 121ee20158ca9869daadf9a2993b431af9661cb6 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Tue, 11 Feb 2014 03:21:28 +0000
Subject: Tue Feb 11 03:19:20 UTC 2014

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

(limited to 'extra/valgrind')

diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 2a0fc272e..59ac68fa4 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,20 +1,26 @@
-# $Id: PKGBUILD 199307 2013-11-10 08:38:12Z allan $
+# $Id: PKGBUILD 205617 2014-02-10 03:08:14Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 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=('staticlibs' '!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0947de8112f946b9ce64764af7be6df2')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+        valgrind-3.9.0-glibc-2.19.patch)
+md5sums=('0947de8112f946b9ce64764af7be6df2'
+         '21020338ad5a93e6f9694946183e8835')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.19.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
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])
-- 
cgit v1.2.3-54-g00ecf