diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-07 00:02:03 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-07 00:02:03 +0000 |
| commit | b7c6c9c7844914d1d0617a24b9e3a84d691d1f64 (patch) | |
| tree | e83e42e7aa3b5f01bbd1a22f539aa807e586e04b /extra/valgrind | |
| parent | ce1cc063cc56f59a630e758c92a9f8ac67a24c32 (diff) | |
Sat Jul 7 00:02:03 UTC 2012
Diffstat (limited to 'extra/valgrind')
| -rw-r--r-- | extra/valgrind/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/valgrind/valgrind-3.7.0-glibc-2.16.patch | 41 |
2 files changed, 47 insertions, 6 deletions
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index c5e0b99ab..bf8d65e97 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 145921 2012-01-04 01:26:06Z allan $ +# $Id: PKGBUILD 163013 2012-07-05 13:49:57Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind pkgver=3.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') url="http://valgrind.org/" -depends=('glibc>=2.15' 'glibc<2.16' 'perl') +depends=('glibc>=2.16' 'glibc<2.17' 'perl') makedepends=('gdb') options=('!emptydirs') source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 - valgrind-3.7.0-glibc-2.15.patch) + valgrind-3.7.0-glibc-2.16.patch) md5sums=('a855fda56edf05614f099dca316d1775' - 'f534b79b358cdced0319b375aafde4d5') + '8362c9c10b8d7d08d1be628a717cfba7') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch + patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.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.16.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch new file mode 100644 index 000000000..4d28ff11a --- /dev/null +++ b/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch @@ -0,0 +1,41 @@ +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,28 @@ + 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}" ++ ;; ++ ++ 2.16) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5 ++$as_echo "2.16 family" >&6; } ++ ++$as_echo "#define GLIBC_2_16 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.16" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; + esac |