Removing valgrind patches, as we got a recent valgrind already.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24853

3 files changed, 2 insertions, 131 deletions

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 48441384759..5638e810edf 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -8,14 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw";
   };
 
-  # Make Valgrind compile with Glibc 2.12.
-  patches = [ ./glibc-2.12.patch ./stat_h.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;
+  buildNativeInputs = [ perl autoconf automake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb;
 
   configureFlags =
     if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];
diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch
deleted file mode 100644
index bdee0778732..00000000000
--- a/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-I changed the patch for 2.11 so it allows 2.12 too.
-
-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,26 @@
- ],
- 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([GLIBC_212], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
-+  GLIBC_212
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION="2.12")
-+
- AC_EGREP_CPP([AIX5_LIBC], [
- #include <standards.h>
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
-@@ -742,6 +752,20 @@
- 	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}"
-+	;;
-+     2.12)
-+	AC_MSG_RESULT(2.12 family)
-+	AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.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.12])
- 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
diff --git a/pkgs/development/tools/analysis/valgrind/stat_h.patch b/pkgs/development/tools/analysis/valgrind/stat_h.patch
deleted file mode 100644
index c191cf45698..00000000000
--- a/pkgs/development/tools/analysis/valgrind/stat_h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Taken from gentoo:
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch?view=markup
-
-http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-stat_h.patch?view=log
-
---- include/vki/vki-amd64-linux.h
-+++ include/vki/vki-amd64-linux.h
-@@ -310,6 +310,9 @@ struct vki_stat {
- 	long		st_blksize;
- 	long		st_blocks;	/* Number 512-byte blocks allocated. */
- 
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
- 	unsigned long	st_atime;
- 	unsigned long 	st_atime_nsec; 
- 	unsigned long	st_mtime;
---- include/vki/vki-x86-linux.h
-+++ include/vki/vki-x86-linux.h
-@@ -348,6 +348,9 @@ struct vki_stat {
- 	unsigned long  st_size;
- 	unsigned long  st_blksize;
- 	unsigned long  st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
- 	unsigned long  st_atime;
- 	unsigned long  st_atime_nsec;
- 	unsigned long  st_mtime;
---- include/vki/vki-ppc32-linux.h
-+++ include/vki/vki-ppc32-linux.h
-@@ -392,6 +392,9 @@ struct vki_stat {
-    long			st_size;
-    unsigned long	st_blksize;
-    unsigned long	st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
-    unsigned long	st_atime;
-    unsigned long	st_atime_nsec;
-    unsigned long	st_mtime;
---- include/vki/vki-ppc64-linux.h
-+++ include/vki/vki-ppc64-linux.h
-@@ -428,6 +428,9 @@ struct vki_stat {
-   long            st_size;
-   unsigned long   st_blksize;
-   unsigned long   st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
-   unsigned long   st_atime;
-   unsigned long   st_atime_nsec;
-   unsigned long   st_mtime;