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

valgrind: Support Glibc 2.19

Browse Source
This commit is contained in:
Eelco Dolstra 2014-02-26 12:39:46 +01:00
parent a0bbe58a19
commit 77a49e5813
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/valgrind/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6"; sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6";
}; };
patches = [ ./glibc-2.19.patch ];
# Perl is needed for `cg_annotate'. # Perl is needed for `cg_annotate'.
# GDB is needed to provide a sane default for `--db-command'. # GDB is needed to provide a sane default for `--db-command'.
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
patchPhase = postPatch =
# Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666). # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
'' ''
echo "getting rid of the \`-arch' GCC option..." echo "getting rid of the \`-arch' GCC option..."

39
pkgs/development/tools/analysis/valgrind/glibc-2.19.patch Normal file
View File

@ -0,0 +1,39 @@
https://projects.archlinux.org/svntogit/packages.git/plain/trunk/valgrind-3.9.0-glibc-2.19.patch?h=packages/valgrind
diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
--- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000
+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000
@@ -6689,6 +6689,16 @@
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
+ 2.19)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
+$as_echo "2.19 family" >&6; }
+
+$as_echo "#define GLIBC_2_19 1" >>confdefs.h
+
+ 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)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
$as_echo "Darwin" >&6; }
diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
--- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000
+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000
@@ -918,6 +918,13 @@
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
+ 2.19)
+ AC_MSG_RESULT(2.19 family)
+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.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])