diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-03 09:01:14 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-03 09:01:14 +0000 |
| commit | 6391408e7a01160fcc484c753e3c83aab8c526c0 (patch) | |
| tree | f1b132cb3324e4928fef0f7395e60526a97d4a56 /pkgs/development/tools/analysis | |
| parent | 25de2c279b08315b260716bb54016fd95c255e92 (diff) | |
| download | nixlib-6391408e7a01160fcc484c753e3c83aab8c526c0.tar nixlib-6391408e7a01160fcc484c753e3c83aab8c526c0.tar.gz nixlib-6391408e7a01160fcc484c753e3c83aab8c526c0.tar.bz2 nixlib-6391408e7a01160fcc484c753e3c83aab8c526c0.tar.lz nixlib-6391408e7a01160fcc484c753e3c83aab8c526c0.tar.xz nixlib-6391408e7a01160fcc484c753e3c83aab8c526c0.tar.zst nixlib-6391408e7a01160fcc484c753e3c83aab8c526c0.zip | |
Trying to make valgrind build in glibc 2.12 (blind commit)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24028
Diffstat (limited to 'pkgs/development/tools/analysis')
| -rw-r--r-- | pkgs/development/tools/analysis/valgrind/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/valgrind/glibc-2.12.patch (renamed from pkgs/development/tools/analysis/valgrind/glibc-2.11.patch) | 25 |
2 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index fdf2bf1777f2..056b05cd0d62 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl"; }; - # Make Valgrind compile with Glibc 2.11. - patches = [ ./glibc-2.11.patch ]; + # Make Valgrind compile with Glibc 2.12. + patches = [ ./glibc-2.12.patch ]; patchFlags = "-p0"; preConfigure = "autoreconf"; diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch index e2ce53217c9e..bdee0778732d 100644 --- a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch +++ b/pkgs/development/tools/analysis/valgrind/glibc-2.12.patch @@ -1,3 +1,5 @@ +I changed the patch for 2.11 so it allows 2.12 too. + r10941 from svn://svn.valgrind.org/valgrind/trunk ------------------------------------------------------------------------ @@ -11,7 +13,7 @@ Index: configure.in =================================================================== --- configure.in (revision 10940) +++ configure.in (revision 10941) -@@ -656,6 +656,16 @@ +@@ -656,6 +656,26 @@ ], GLIBC_VERSION="2.10") @@ -25,10 +27,20 @@ Index: configure.in +], +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,13 @@ +@@ -742,6 +752,20 @@ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; @@ -39,6 +51,13 @@ Index: configure.in + 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]) @@ -47,7 +66,7 @@ Index: configure.in *) 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([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]) ;; |