Updating valgrind to 3.6.0

svn path=/nixpkgs/trunk/; revision=24803

2 files changed, 2 insertions, 60 deletions

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index fdf2bf1777f..3de750c028a 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,18 +1,13 @@
 { stdenv, fetchurl, perl, gdb, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.5.0";
+  name = "valgrind-3.6.0";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl";
+    sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw";
   };
 
-  # Make Valgrind compile with Glibc 2.11.
-  patches = [ ./glibc-2.11.patch ];
-  patchFlags = "-p0";
-  preConfigure = "autoreconf";
-
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
   buildInputs = [ perl autoconf automake ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch
deleted file mode 100644
index e2ce53217c9..00000000000
--- a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-r10941 from svn://svn.valgrind.org/valgrind/trunk
-
-------------------------------------------------------------------------
-r10941 | bart | 2009-11-15 20:11:19 +0100 (Sun, 15 Nov 2009) | 2 lines
-
-Added support for glibc 2.11.
-
-------------------------------------------------------------------------
-
-Index: configure.in
-===================================================================
---- configure.in	(revision 10940)
-+++ configure.in	(revision 10941)
-@@ -656,6 +656,16 @@
- ],
- 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 +752,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 +772,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])
- 	;;