Date: Tuesday, December 27, 2011 @ 05:53:45 Author: allan Revision: 145690
upgpkg: valgrind 3.7.0-2 glibc-2.15 toolchain build Added: valgrind/trunk/valgrind-3.7.0-glibc-2.15.patch Modified: valgrind/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 12 ++++++++---- valgrind-3.7.0-glibc-2.15.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-12-27 10:37:25 UTC (rev 145689) +++ PKGBUILD 2011-12-27 10:53:45 UTC (rev 145690) @@ -4,19 +4,23 @@ pkgname=valgrind pkgver=3.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') url="http://valgrind.org/" -depends=('glibc>=2.14' 'glibc<2.15' 'perl') +depends=('glibc>=2.15' 'glibc<2.16' 'perl') makedepends=('gdb') options=('!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a855fda56edf05614f099dca316d1775') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 + valgrind-3.7.0-glibc-2.15.patch) +md5sums=('a855fda56edf05614f099dca316d1775' + 'f534b79b358cdced0319b375aafde4d5') build() { cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch if [ "${CARCH}" = "x86_64" ]; then ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit Added: valgrind-3.7.0-glibc-2.15.patch =================================================================== --- valgrind-3.7.0-glibc-2.15.patch (rev 0) +++ valgrind-3.7.0-glibc-2.15.patch 2011-12-27 10:53:45 UTC (rev 145690) @@ -0,0 +1,30 @@ +diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure +--- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000 ++++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000 +@@ -6402,6 +6402,17 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.15) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5 ++$as_echo "2.15 family" >&6; } ++ ++$as_echo "#define GLIBC_2_15 1" >>confdefs.h ++ ++ 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}" ++ ;; ++ + darwin) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 + $as_echo "Darwin" >&6; } +@@ -6422,7 +6433,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 + $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } +- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 ++ as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; + esac