# HG changeset patch # User Christopher Rogers # Date 1287714094 0 # Node ID 3775d01597edc738f1512bbdd093809629b5d93c # Parent d22789fb1e9200689d73684ccd25f37997b4d536 Up: vargrind to 3.6.0. diff -r d22789fb1e92 -r 3775d01597ed valgrind-dev/receipt --- a/valgrind-dev/receipt Thu Oct 21 23:49:16 2010 +0000 +++ b/valgrind-dev/receipt Fri Oct 22 02:21:34 2010 +0000 @@ -1,11 +1,11 @@ # SliTaz package receipt. PACKAGE="valgrind-dev" -VERSION="3.5.0" +VERSION="3.6.0" CATEGORY="development" SHORT_DESC="Valgrind devel files." MAINTAINER="paul@slitaz.org" -DEPENDS="" +DEPENDS="valgrind" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://valgrind.org/" WANTED="valgrind" diff -r d22789fb1e92 -r 3775d01597ed valgrind/receipt --- a/valgrind/receipt Thu Oct 21 23:49:16 2010 +0000 +++ b/valgrind/receipt Fri Oct 22 02:21:34 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="valgrind" -VERSION="3.5.0" +VERSION="3.6.0" CATEGORY="development" SHORT_DESC="Memory debugger and profiler." MAINTAINER="paul@slitaz.org" @@ -21,7 +21,7 @@ # Fix build with glibc 2.11 #http://www.linuxfromscratch.org/patches/downloads/valgrind/valgrind-3.5.0-glibc-2.11.patch - patch -p1 < ../stuff/valgrind-3.5.0-glibc211.u || exit 1 + patch -p1 < ../stuff/valgrind-3.6.0-glibc211.u || exit 1 autoconf ./configure \ diff -r d22789fb1e92 -r 3775d01597ed valgrind/stuff/valgrind-3.5.0-glibc211.u --- a/valgrind/stuff/valgrind-3.5.0-glibc211.u Thu Oct 21 23:49:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -Submitted By: Agathoklis Hatzimanikas -Date: 2010-01-06 -Initial Package Version: 3.5.0 -Upstream Status: Uknown -Origin: Gentoo -Description: Allows Valgring to build with glibc-2.11 - -diff -ruN valgrind-3.5.0/configure.in valgrind-3.5.0-fixed/configure.in ---- valgrind-3.5.0/configure.in 2009-11-07 23:34:37.000000000 +0100 -+++ valgrind-3.5.0-fixed/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 -r d22789fb1e92 -r 3775d01597ed valgrind/stuff/valgrind-3.6.0-glibc211.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/valgrind/stuff/valgrind-3.6.0-glibc211.u Fri Oct 22 02:21:34 2010 +0000 @@ -0,0 +1,51 @@ +Submitted By: Agathoklis Hatzimanikas +Date: 2010-01-06 +Initial Package Version: 3.5.0 +Upstream Status: Uknown +Origin: Gentoo +Description: Allows Valgring to build with glibc-2.11 + +diff -ruN valgrind-3.5.0/configure.in valgrind-3.5.0-fixed/configure.in +--- valgrind-3.5.0/configure.in 2009-11-07 23:34:37.000000000 +0100 ++++ valgrind-3.5.0-fixed/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 ${GLIBC_VERSION}]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12]) ++ 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]) + ;; +