From 37bedb9d141880dad6cf56b36e97072dc1a0024b46a1a39229199c096ec40ff8 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 6 Jan 2010 16:55:32 +0000
Subject: [PATCH] - fix build against glibc 2.11

OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=7
---
 glibc-211.diff   | 43 +++++++++++++++++++++++++++++++++++++++++++
 valgrind.changes |  5 +++++
 valgrind.spec    |  2 ++
 3 files changed, 50 insertions(+)
 create mode 100644 glibc-211.diff

diff --git a/glibc-211.diff b/glibc-211.diff
new file mode 100644
index 0000000..ecf36bc
--- /dev/null
+++ b/glibc-211.diff
@@ -0,0 +1,43 @@
+--- configure.in
++++ configure.in
+@@ -656,6 +656,17 @@
+ ],
+ GLIBC_VERSION="2.10")
+ 
++AC_EGREP_CPP([GLIBC_211], [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
++  GLIBC_211
++ #endif
++#endif
++],
++GLIBC_VERSION="2.11")
++
++
+ AC_EGREP_CPP([AIX5_LIBC], [
+ #include <standards.h>
+ #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
+@@ -742,6 +753,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.11)
++	AC_MSG_RESULT(2.11 family)
++	AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.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}"
++	;;
+      aix5)
+ 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
+ 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
+@@ -755,7 +773,7 @@
+ 
+      *)
+ 	AC_MSG_RESULT(unsupported version)
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11])
+ 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
diff --git a/valgrind.changes b/valgrind.changes
index 1cea803..e0028e0 100644
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan  6 17:54:54 CET 2010 - dmueller@suse.de
+
+- fix build against glibc 2.11
+
 -------------------------------------------------------------------
 Wed Dec  2 22:25:34 CET 2009 - dmueller@suse.de
 
diff --git a/valgrind.spec b/valgrind.spec
index 0e5653d..fb6c2af 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -34,6 +34,7 @@ Source0:        %{name}-%{version}.tar.bz2
 # svn  di svn://svn.valgrind.org/vex/tags/VEX_3_2_1 svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH > VEX_3_2_BRANCH.diff
 Patch1:         jit-register-unregister.diff
 Patch2:         deprecated.diff
+Patch3:         glibc-211.diff
 Provides:       callgrind = %version
 Obsoletes:      callgrind < %version
 ExclusiveArch:  %ix86 x86_64 ppc ppc64
@@ -118,6 +119,7 @@ cd VEX
 cd ..
 %patch1
 %patch2
+%patch3
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"