diff options
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/valgrind-glibc.patch | 21 | ||||
| -rw-r--r-- | gnu/packages/valgrind.scm | 7 |
3 files changed, 3 insertions, 26 deletions
diff --git a/gnu-system.am b/gnu-system.am index 87cb122553..8f8ce4003d 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -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 \ diff --git a/gnu/packages/patches/valgrind-glibc.patch b/gnu/packages/patches/valgrind-glibc.patch deleted file mode 100644 index 47a415bb8f..0000000000 --- a/gnu/packages/patches/valgrind-glibc.patch +++ /dev/null @@ -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; } diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 183adb0271..82e3b80f7f 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -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 |