diff options
| author | Peter Wang <novalazy@gmail.com> | 2010-03-25 23:35:53 +0100 |
|---|---|---|
| committer | Heinz Wiesinger <pprkut@slackbuilds.org> | 2010-05-13 14:46:26 +0200 |
| commit | 596836f66457ce23f77b952764ca3f4bdf9d2858 (patch) | |
| tree | 3ba85ec30b3abc3dea2defbccc9d3a9087aaad5e /development/valgrind | |
| parent | 5c2d556a3b2e9732c6a1700ba22bb7a8c22aa4bb (diff) | |
development/valgrind: Added patch for newer glibc versions.
Diffstat (limited to 'development/valgrind')
| -rw-r--r-- | development/valgrind/valgrind-3.5.0-glibc-2.11.patch | 51 | ||||
| -rw-r--r-- | development/valgrind/valgrind.SlackBuild | 7 | ||||
| -rw-r--r-- | development/valgrind/valgrind.info | 2 |
3 files changed, 58 insertions, 2 deletions
diff --git a/development/valgrind/valgrind-3.5.0-glibc-2.11.patch b/development/valgrind/valgrind-3.5.0-glibc-2.11.patch new file mode 100644 index 000000000000..4866ee5326b6 --- /dev/null +++ b/development/valgrind/valgrind-3.5.0-glibc-2.11.patch @@ -0,0 +1,51 @@ +From valgrind SVN +------------------------------------------------------------------------ +r10941 | bart | 2009-11-16 06:11:19 +1100 (Mon, 16 Nov 2009) | 2 lines + +Added support for glibc 2.11. + +------------------------------------------------------------------------ +Index: configure.in +=================================================================== +--- configure.in (revision 10940) ++++ configure.in (revision 10941) +@@ -656,6 +656,16 @@ + ], + GLIBC_VERSION="2.10") + ++AC_EGREP_CPP([GLIBC_211], [ ++#include <features.h> ++#ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) ++ GLIBC_211 ++ #endif ++#endif ++], ++GLIBC_VERSION="2.11") ++ + AC_EGREP_CPP([AIX5_LIBC], [ + #include <standards.h> + #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/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild index 429f511e9462..0af1d6911e3f 100644 --- a/development/valgrind/valgrind.SlackBuild +++ b/development/valgrind/valgrind.SlackBuild @@ -7,7 +7,7 @@ PRGNAM=valgrind VERSION=3.5.0 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -35,6 +35,10 @@ cd $PRGNAM-$VERSION || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . +# For compatibility with -current; thanks to Arne Welzel for the report. +patch -p0 < $CWD/valgrind-3.5.0-glibc-2.11.patch || exit 1 +autoconf || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -42,6 +46,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib$LIBDIRSUFFIX \ --sysconfdir=/etc \ --localstatedir=/var \ + --mandir=/usr/man \ || exit 1 make || exit 1 diff --git a/development/valgrind/valgrind.info b/development/valgrind/valgrind.info index a589fc6c00bd..4a54d2313db1 100644 --- a/development/valgrind/valgrind.info +++ b/development/valgrind/valgrind.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Peter Wang" EMAIL="novalazy@gmail.com" -APPROVED="dsomero" +APPROVED="pprkut" |