diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-04 23:14:55 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-04 23:14:55 +0000 |
| commit | 85828cc2c2c3ef5c0b9b03388b9323d3d163b389 (patch) | |
| tree | d2f2125c0ff38894f9c3ffe29164f5f763a762f0 /extra/valgrind | |
| parent | d1d68784dc66793601c239fa64cc0e02ebd9444e (diff) | |
Wed Jan 4 23:14:55 UTC 2012
Diffstat (limited to 'extra/valgrind')
| -rw-r--r-- | extra/valgrind/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/valgrind/valgrind-3.7.0-glibc-2.15.patch | 30 |
2 files changed, 39 insertions, 5 deletions
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index 82a55f4d2..c5e0b99ab 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 142827 2011-11-16 03:17:22Z allan $ +# $Id: PKGBUILD 145921 2012-01-04 01:26:06Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> 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 diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch new file mode 100644 index 000000000..fa400b953 --- /dev/null +++ b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch @@ -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 |