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

Trying to make valgrind build in glibc 2.12 (blind commit)

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24028
This commit is contained in:
Lluís Batlle i Rossell 2010-10-03 09:01:14 +00:00
parent 25de2c279b
commit 6391408e7a
2 changed files with 24 additions and 5 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,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl"; sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl";
}; };
# Make Valgrind compile with Glibc 2.11. # Make Valgrind compile with Glibc 2.12.
patches = [ ./glibc-2.11.patch ]; patches = [ ./glibc-2.12.patch ];
patchFlags = "-p0"; patchFlags = "-p0";
preConfigure = "autoreconf"; preConfigure = "autoreconf";

25
pkgs/development/tools/analysis/valgrind/glibc-2.11.patch → pkgs/development/tools/analysis/valgrind/glibc-2.12.patch
View File

@ -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 r10941 from svn://svn.valgrind.org/valgrind/trunk
------------------------------------------------------------------------ ------------------------------------------------------------------------
@ -11,7 +13,7 @@ Index: configure.in
=================================================================== ===================================================================
--- configure.in (revision 10940) --- configure.in (revision 10940)
+++ configure.in (revision 10941) +++ configure.in (revision 10941)
@@ -656,6 +656,16 @@ @@ -656,6 +656,26 @@
], ],
GLIBC_VERSION="2.10") GLIBC_VERSION="2.10")
@ -24,11 +26,21 @@ Index: configure.in
+#endif +#endif
+], +],
+GLIBC_VERSION="2.11") +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], [ AC_EGREP_CPP([AIX5_LIBC], [
#include <standards.h> #include <standards.h>
#if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) #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.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;; ;;
@ -38,6 +50,13 @@ Index: configure.in
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.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) aix5)
AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
@ -47,7 +66,7 @@ Index: configure.in
*) *)
AC_MSG_RESULT(unsupported version) 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.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 AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
AC_MSG_ERROR([or Darwin libc]) AC_MSG_ERROR([or Darwin libc])
;; ;;