From ceafaf1297b592542720bde9c673d103c6a5981d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 7 Feb 2013 14:23:03 +0100 Subject: [PATCH] valgrind: depend on glibc-dbg now that we have libc dbg pkgs. --- srcpkgs/valgrind/template | 4 ++-- srcpkgs/valgrind/valgrind-devel.template | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template index 91f1396e79a..bb9a05252ed 100644 --- a/srcpkgs/valgrind/template +++ b/srcpkgs/valgrind/template @@ -1,11 +1,11 @@ # Template file for 'valgrind' pkgname=valgrind version=3.8.1 -revision=2 +revision=3 subpackages="${pkgname}-devel" build_style=gnu-configure configure_args="--enable-tls --with-mpicc=/dev/null" -depends="glibc>=2.17<2.18" +depends="glibc>=2.17<2.18 glibc-dbg>=2.17<2.18" makedepends="pkg-config" fulldepends="perl>=0" short_desc="Tool for finding memory management bugs in programs" diff --git a/srcpkgs/valgrind/valgrind-devel.template b/srcpkgs/valgrind/valgrind-devel.template index ca396067c09..d510dd9cde5 100644 --- a/srcpkgs/valgrind/valgrind-devel.template +++ b/srcpkgs/valgrind/valgrind-devel.template @@ -1,14 +1,11 @@ # Template file for 'valgrind-devel'. # depends="valgrind>=${version}" -short_desc="${short_desc} (development files)" +short_desc="${short_desc} -- development files" do_install() { - install -d ${DESTDIR}/usr/lib/valgrind - install -d ${DESTDIR}/usr/share - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/valgrind/*.a ${DESTDIR}/usr/lib/valgrind - mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove "usr/lib/valgrind/*.a" usr/lib/valgrind + vmove usr/share/doc usr/share }