public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Valgrind updated to 2.4.0.

Browse Source 
svn path=/nixpkgs/trunk/; revision=2520
This commit is contained in:
Eelco Dolstra 2005-04-11 08:55:05 +00:00
parent 013300cb0e
commit 5c72ac8252
2 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/tools/misc/valgrind/default.nix
View File

@ -3,23 +3,13 @@
# Note: I added the Perl dependency for Valgrind 2.1.1. It's needed # Note: I added the Perl dependency for Valgrind 2.1.1. It's needed
# to generate some files. Maybe in stable releases we won't need # to generate some files. Maybe in stable releases we won't need
# Perl. # Perl.
# Update: 2.2.0 still needs it. # Update: 2.4.0 still needs it.
stdenv.mkDerivation { stdenv.mkDerivation {
name = "valgrind-2.2.0"; name = "valgrind-2.4.0";
src = fetchurl { src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.2.0.tar.bz2; url = http://valgrind.org/downloads/valgrind-2.4.0.tar.bz2;
md5 = "30dc51f6fc94751b90b04af9c2e2c656"; md5 = "1d0bd81d368789946d32d18a468ea0cf";
}; };
buildInputs = [perl]; buildInputs = [perl];
# Hack to get Valgrind to compile with Linux 2.6.10 headers. The
# file `include/asm/processor.h' indirectly needs
# CONFIG_X86_L1_CACHE_SHIFT (for the alignment of some type that
# probably isn't relevant here anyway).
# !!! maybe this should be done in linux-headers?
NIX_CFLAGS_COMPILE = "-DCONFIG_X86_L1_CACHE_SHIFT=7";
# Another kernel header problem.
patches = [./pgoff_t.patch];
} }

34
pkgs/development/tools/misc/valgrind/pgoff_t.patch
View File

@ -1,34 +0,0 @@
diff -rc valgrind-orig/coregrind/vg_unsafe.h valgrind-2.2.0/coregrind/vg_unsafe.h
*** valgrind-orig/coregrind/vg_unsafe.h 2004-08-29 23:02:28.000000000 +0200
--- valgrind-2.2.0/coregrind/vg_unsafe.h 2005-02-23 21:39:25.000000000 +0100
***************
*** 31,36 ****
--- 31,40 ----
*/
+ #ifndef pgoff_t
+ #define pgoff_t unsigned long
+ #endif
+
/* These includes are only used for making sense of the args for
system calls. */
#include "vg_unistd.h" /* for system call numbers */
***************
*** 47,53 ****
#include <sys/socket.h> /* for struct msghdr */
#include <linux/sockios.h>/* for SIOCOUTQ */
#include <sys/un.h> /* for sockaddr_un */
! #include <net/if.h> /* for struct ifreq et al */
#include <net/if_arp.h> /* for struct arpreq */
#include <net/route.h> /* for struct rtentry */
#ifdef HAVE_LINUX_COMPILER_H
--- 51,58 ----
#include <sys/socket.h> /* for struct msghdr */
#include <linux/sockios.h>/* for SIOCOUTQ */
#include <sys/un.h> /* for sockaddr_un */
! /* hack - should be fixed in CVS */
! //#include <net/if.h> /* for struct ifreq et al */
#include <net/if_arp.h> /* for struct arpreq */
#include <net/route.h> /* for struct rtentry */
#ifdef HAVE_LINUX_COMPILER_H