wok-6.x rev 5890
valgrind: Fix build with glibc 2.11
author | Eric Joseph-Alexandre <erjo@slitaz.org> |
---|---|
date | Thu Jul 22 08:02:40 2010 +0200 (2010-07-22) |
parents | cf3282837399 |
children | 5c44261d9d9f |
files | valgrind/receipt valgrind/stuff/valgrind-3.5.0-glibc211.u |
line diff
1.1 --- a/valgrind/receipt Thu Jul 22 01:56:20 2010 +0200 1.2 +++ b/valgrind/receipt Thu Jul 22 08:02:40 2010 +0200 1.3 @@ -6,7 +6,7 @@ 1.4 SHORT_DESC="Memory debugger and profiler." 1.5 MAINTAINER="paul@slitaz.org" 1.6 DEPENDS="" 1.7 -BUILD_DEPENDS="sed" 1.8 +BUILD_DEPENDS="sed autoconf" 1.9 SUGGESTED="perl" 1.10 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.11 WEB_SITE="http://valgrind.org/" 1.12 @@ -18,6 +18,12 @@ 1.13 compile_rules() 1.14 { 1.15 cd $src 1.16 + 1.17 + # Fix build with glibc 2.11 1.18 + #http://www.linuxfromscratch.org/patches/downloads/valgrind/valgrind-3.5.0-glibc-2.11.patch 1.19 + patch -p1 < ../stuff/valgrind-3.5.0-glibc211.u || exit 1 1.20 + autoconf 1.21 + 1.22 ./configure \ 1.23 --prefix=/usr \ 1.24 --infodir=/usr/share/info \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/valgrind/stuff/valgrind-3.5.0-glibc211.u Thu Jul 22 08:02:40 2010 +0200 2.3 @@ -0,0 +1,51 @@ 2.4 +Submitted By: Agathoklis Hatzimanikas <ag at linuxfromscratch dot org> 2.5 +Date: 2010-01-06 2.6 +Initial Package Version: 3.5.0 2.7 +Upstream Status: Uknown 2.8 +Origin: Gentoo 2.9 +Description: Allows Valgring to build with glibc-2.11 2.10 + 2.11 +diff -ruN valgrind-3.5.0/configure.in valgrind-3.5.0-fixed/configure.in 2.12 +--- valgrind-3.5.0/configure.in 2009-11-07 23:34:37.000000000 +0100 2.13 ++++ valgrind-3.5.0-fixed/configure.in 2009-11-07 23:38:14.000000000 +0100 2.14 +@@ -656,6 +656,16 @@ 2.15 + ], 2.16 + GLIBC_VERSION="2.10") 2.17 + 2.18 ++AC_EGREP_CPP([GLIBC_211], [ 2.19 ++#include <features.h> 2.20 ++#ifdef __GNU_LIBRARY__ 2.21 ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) 2.22 ++ GLIBC_211 2.23 ++ #endif 2.24 ++#endif 2.25 ++], 2.26 ++GLIBC_VERSION="2.11") 2.27 ++ 2.28 + AC_EGREP_CPP([AIX5_LIBC], [ 2.29 + #include <standards.h> 2.30 + #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) 2.31 +@@ -742,6 +752,13 @@ 2.32 + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 2.33 + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 2.34 + ;; 2.35 ++ 2.11) 2.36 ++ AC_MSG_RESULT(2.11 family) 2.37 ++ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x]) 2.38 ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 2.39 ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 2.40 ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 2.41 ++ ;; 2.42 + aix5) 2.43 + AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) 2.44 + AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) 2.45 +@@ -755,7 +772,7 @@ 2.46 + 2.47 + *) 2.48 + AC_MSG_RESULT(unsupported version) 2.49 +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10]) 2.50 ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) 2.51 + AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) 2.52 + AC_MSG_ERROR([or Darwin libc]) 2.53 + ;; 2.54 +