From f0086e54723134a0ccdd0ed384984a562a9ac4f4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 13 Aug 2013 11:40:53 +0200 Subject: [PATCH] valgrind: rebuild against glibc-2.18. --- srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch | 4 ++-- srcpkgs/valgrind/template | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch b/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch index 28a1a604f1..67dede7842 100644 --- a/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch +++ b/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch @@ -4,7 +4,7 @@ # DEFAULT_SUPP set by kernel version check above. ;; -+ 2.17) ++ 2.1[78]*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 +$as_echo "2.17 family" >&6; } + @@ -30,7 +30,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 "Valgrind requires glibc version 2.2 - 2.18" "$LINENO" 5 as_fn_error "or Darwin libc" "$LINENO" 5 ;; esac diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template index a6f410089c..5645bdc95c 100644 --- a/srcpkgs/valgrind/template +++ b/srcpkgs/valgrind/template @@ -1,11 +1,11 @@ # Template file for 'valgrind' pkgname=valgrind version=3.8.1 -revision=3 +revision=4 only_for_archs="i686 x86_64" build_style=gnu-configure configure_args="--enable-tls --with-mpicc=/dev/null" -makedepends="perl pkg-config" +hostmakedepends="perl pkg-config" short_desc="Tool for finding memory management bugs in programs" maintainer="Juan RP " homepage="http://valgrind.org/" @@ -15,7 +15,7 @@ checksum=473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db valgrind-devel_package() { depends="valgrind>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" -- development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -25,7 +25,7 @@ valgrind-devel_package() { } valgrind_package() { - depends="perl glibc>=2.17<2.18 glibc-dbg>=2.17<2.18" + depends="perl glibc>=2.18<2.19 glibc-dbg>=2.18<2.19" pkg_install() { vmove usr }