From 92b6f5980a056de54c0e3d875517c88d082fe4e2d35108b0804734f75bf911c9 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 10 Feb 2015 10:20:04 +0000
Subject: [PATCH] Accepting request 285065 from home:Andreas_Schwab:Factory

- glibc-version.patch: Add support for glibc 2.21.

OBS-URL: https://build.opensuse.org/request/show/285065
OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=124
---
 glibc-version.patch | 18 ++++++++++++++++++
 valgrind.changes    |  5 +++++
 valgrind.spec       |  4 +++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 glibc-version.patch

diff --git a/glibc-version.patch b/glibc-version.patch
new file mode 100644
index 0000000..8414673
--- /dev/null
+++ b/glibc-version.patch
@@ -0,0 +1,18 @@
+Index: valgrind-3.10.0/configure.ac
+===================================================================
+--- valgrind-3.10.0.orig/configure.ac
++++ valgrind-3.10.0/configure.ac
+@@ -1018,6 +1018,13 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.21)
++	AC_MSG_RESULT(2.21 family)
++	AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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])
diff --git a/valgrind.changes b/valgrind.changes
index a9df529..495710d 100644
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  9 13:41:38 UTC 2015 - schwab@suse.de
+
+- glibc-version.patch: Add support for glibc 2.21.
+
 -------------------------------------------------------------------
 Tue Sep 16 15:39:34 UTC 2014 - schwab@suse.de
 
diff --git a/valgrind.spec b/valgrind.spec
index 776c197..e53cbac 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package valgrind
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,6 +40,7 @@ Source0:        http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
 # svn  di svn://svn.valgrind.org/vex/tags/VEX_3_5_0 svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff
 Patch1:         jit-register-unregister.diff
 Patch2:         armv6-support.diff
+Patch3:         glibc-version.patch
 # during building the major version of glibc is built into the suppression file
 %define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1)
 %define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2)
@@ -136,6 +137,7 @@ Authors:
 %setup -q -n %{name}-%{version}
 %patch1
 %patch2
+%patch3 -p1
 
 %build
 %ifarch %arm