diff options
Diffstat (limited to 'extra/valgrind')
-rw-r--r-- | extra/valgrind/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/valgrind/valgrind-3.8.1-glibc-2.17.patch | 37 |
2 files changed, 46 insertions, 5 deletions
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index f1d525b93..fd6cd7b6d 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 166800 2012-09-19 10:37:35Z allan $ +# $Id: PKGBUILD 173941 2012-12-28 13:12:00Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind pkgver=3.8.1 -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.16' 'glibc<2.17' 'perl') +depends=('glibc>=2.17' 'glibc<2.18' 'perl') makedepends=('gdb') options=('!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('288758010b271119a0ffc0183f1d6e38') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 + valgrind-3.8.1-glibc-2.17.patch) +md5sums=('288758010b271119a0ffc0183f1d6e38' + 'e87c34f9f9ce0040d141b3bd57842b5c') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch + if [ "${CARCH}" = "x86_64" ]; then ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit else diff --git a/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch new file mode 100644 index 000000000..bfeb9486d --- /dev/null +++ b/extra/valgrind/valgrind-3.8.1-glibc-2.17.patch @@ -0,0 +1,37 @@ +diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure +--- valgrind-3.8.1-orig/configure 2012-09-19 05:19:23.000000000 +1000 ++++ valgrind-3.8.1/configure 2012-12-27 08:11:36.645429011 +1000 +@@ -6612,6 +6612,24 @@ + + # DEFAULT_SUPP set by kernel version check above. + ;; ++ 2.17) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 ++$as_echo "2.17 family" >&6; } ++ ++$as_echo "#define GLIBC_2_17 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; } ++ ++$as_echo "#define DARWIN_LIBC 1" >>confdefs.h ++ ++ # DEFAULT_SUPP set by kernel version check above. ++ ;; + bionic) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5 + $as_echo "Bionic" >&6; } +@@ -6624,7 +6642,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.16" "$LINENO" 5 ++ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; + esac |