From 8b78d679e45431d455bac26a800d504b8dc6b7cd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 13 Jan 2010 17:46:17 +0100 Subject: [PATCH] valgrind: added patch to build with glibc-2.11 from gentoo. --HG-- extra : convert_revision : e599412ecc1d20314c2d36f23e1f7f68f1405092 --- .../patches/valgrind-3.5.0-glibc-2.11.patch | 42 +++++++++++++++++++ srcpkgs/valgrind/template | 8 +++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/valgrind/patches/valgrind-3.5.0-glibc-2.11.patch diff --git a/srcpkgs/valgrind/patches/valgrind-3.5.0-glibc-2.11.patch b/srcpkgs/valgrind/patches/valgrind-3.5.0-glibc-2.11.patch new file mode 100644 index 00000000000..cb7bc4e6edc --- /dev/null +++ b/srcpkgs/valgrind/patches/valgrind-3.5.0-glibc-2.11.patch @@ -0,0 +1,42 @@ +--- configure.in 2009-11-07 23:34:37.000000000 +0100 ++++ configure.in 2009-11-07 23:38:14.000000000 +0100 +@@ -656,6 +656,16 @@ + ], + GLIBC_VERSION="2.10") + ++AC_EGREP_CPP([GLIBC_211], [ ++#include ++#ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) ++ GLIBC_211 ++ #endif ++#endif ++], ++GLIBC_VERSION="2.11") ++ + AC_EGREP_CPP([AIX5_LIBC], [ + #include + #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) +@@ -742,6 +752,13 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.11) ++ AC_MSG_RESULT(2.11 family) ++ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.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]) +@@ -755,7 +772,7 @@ + + *) + 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([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) + AC_MSG_ERROR([or Darwin libc]) + ;; diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template index 5be3d43e486..90dbad8fbb2 100644 --- a/srcpkgs/valgrind/template +++ b/srcpkgs/valgrind/template @@ -14,5 +14,11 @@ long_desc=" detect a lot of problems that are otherwise very hard to find/diagnose." subpackages="$pkgname-devel" -Add_dependency full glibc +Add_dependency run glibc Add_dependency full perl +Add_dependency build automake + +pre_configure() +{ + cd ${wrksrc} && autoreconf -fi +}