~ruther/guix-local

5f36ea03ad17dc0b04cd170fb4eba3e09f916de7 — Ludovic Courtès 11 years ago cc7f4e0
gnu: valgrind: Update to 3.10.0.

* gnu/packages/valgrind.scm (valgrind): Update to 3.10.0.
* gnu/packages/patches/valgrind-glibc.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
3 files changed, 3 insertions(+), 26 deletions(-)

M gnu-system.am
D gnu/packages/patches/valgrind-glibc.patch
M gnu/packages/valgrind.scm
M gnu-system.am => gnu-system.am +0 -1
@@ 407,7 407,6 @@ dist_patch_DATA =						\
  gnu/packages/patches/texi2html-i18n.patch			\
  gnu/packages/patches/udev-gir-libtool.patch			\
  gnu/packages/patches/util-linux-perl.patch			\
  gnu/packages/patches/valgrind-glibc.patch			\
  gnu/packages/patches/vpnc-script.patch			\
  gnu/packages/patches/w3m-fix-compile.patch			\
  gnu/packages/patches/xmodmap-asprintf.patch			\

D gnu/packages/patches/valgrind-glibc.patch => gnu/packages/patches/valgrind-glibc.patch +0 -21
@@ 1,21 0,0 @@
Accept glibc 2.19 as valid.

--- a/configure	2013-10-10 22:27:20.331223000 +0200
+++ b/configure	2013-10-10 22:27:55.055223000 +0200
@@ -6604,6 +6604,16 @@
 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
 	;;
+     2.19)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
+$as_echo "2.19 family" >&6; }
+
+$as_echo "#define GLIBC_2_18 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; }

M gnu/packages/valgrind.scm => gnu/packages/valgrind.scm +3 -4
@@ 1,5 1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 28,15 28,14 @@
(define-public valgrind
  (package
    (name "valgrind")
    (version "3.9.0")
    (version "3.10.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://valgrind.org/downloads/valgrind-"
                                 version ".tar.bz2"))
             (sha256
              (base32
               "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6"))
             (patches (list (search-patch "valgrind-glibc.patch")))))
               "1jgd42vsx0bcblp91bd61hd5wpy0gghh09wxgm65m666vy17y103"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases (alist-cons-after