diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26 12:39:46 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26 12:39:46 +0100 |
| commit | 77a49e5813351bcfb6541a1ff4be62cbe70e590a (patch) | |
| tree | d021035f405216394bd31624d04be5eb10bac8cb /pkgs/development/tools/analysis/valgrind | |
| parent | a0bbe58a194934f4f503f3215a5a40e6b112c79e (diff) | |
| download | nixlib-77a49e5813351bcfb6541a1ff4be62cbe70e590a.tar nixlib-77a49e5813351bcfb6541a1ff4be62cbe70e590a.tar.gz nixlib-77a49e5813351bcfb6541a1ff4be62cbe70e590a.tar.bz2 nixlib-77a49e5813351bcfb6541a1ff4be62cbe70e590a.tar.lz nixlib-77a49e5813351bcfb6541a1ff4be62cbe70e590a.tar.xz nixlib-77a49e5813351bcfb6541a1ff4be62cbe70e590a.tar.zst nixlib-77a49e5813351bcfb6541a1ff4be62cbe70e590a.zip | |
valgrind: Support Glibc 2.19
Diffstat (limited to 'pkgs/development/tools/analysis/valgrind')
| -rw-r--r-- | pkgs/development/tools/analysis/valgrind/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/valgrind/glibc-2.19.patch | 39 |
2 files changed, 42 insertions, 1 deletions
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 97565bec98e7..a6ea2c2f59d4 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6"; }; + patches = [ ./glibc-2.19.patch ]; + # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patchPhase = + postPatch = # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666). '' echo "getting rid of the \`-arch' GCC option..." diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch new file mode 100644 index 000000000000..137b0a325b04 --- /dev/null +++ b/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch @@ -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]) |