diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-22 10:07:52 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-22 10:07:52 +0200 |
| commit | 5f36ea03ad17dc0b04cd170fb4eba3e09f916de7 (patch) | |
| tree | e9dfcda2ca5872ad60dc4a21e82b6dd2e89be411 | |
| parent | cc7f4e0589bf9b8bc238f0ea2a97b2045251a1a4 (diff) | |
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.
| -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 87cb122553c..8f8ce4003d0 100644 --- a/gnu-system.am +++ b/gnu-system.am | |||
| @@ -407,7 +407,6 @@ dist_patch_DATA = \ | |||
| 407 | gnu/packages/patches/texi2html-i18n.patch \ | 407 | gnu/packages/patches/texi2html-i18n.patch \ |
| 408 | gnu/packages/patches/udev-gir-libtool.patch \ | 408 | gnu/packages/patches/udev-gir-libtool.patch \ |
| 409 | gnu/packages/patches/util-linux-perl.patch \ | 409 | gnu/packages/patches/util-linux-perl.patch \ |
| 410 | gnu/packages/patches/valgrind-glibc.patch \ | ||
| 411 | gnu/packages/patches/vpnc-script.patch \ | 410 | gnu/packages/patches/vpnc-script.patch \ |
| 412 | gnu/packages/patches/w3m-fix-compile.patch \ | 411 | gnu/packages/patches/w3m-fix-compile.patch \ |
| 413 | gnu/packages/patches/xmodmap-asprintf.patch \ | 412 | 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 47a415bb8f6..00000000000 --- a/gnu/packages/patches/valgrind-glibc.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | Accept glibc 2.19 as valid. | ||
| 2 | |||
| 3 | --- a/configure 2013-10-10 22:27:20.331223000 +0200 | ||
| 4 | +++ b/configure 2013-10-10 22:27:55.055223000 +0200 | ||
| 5 | @@ -6604,6 +6604,16 @@ | ||
| 6 | DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 7 | DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 8 | ;; | ||
| 9 | + 2.19) | ||
| 10 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5 | ||
| 11 | +$as_echo "2.19 family" >&6; } | ||
| 12 | + | ||
| 13 | +$as_echo "#define GLIBC_2_18 1" >>confdefs.h | ||
| 14 | + | ||
| 15 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 16 | + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 17 | + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 18 | + ;; | ||
| 19 | darwin) | ||
| 20 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 | ||
| 21 | $as_echo "Darwin" >&6; } | ||
diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 183adb02714..82e3b80f7f8 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -28,15 +28,14 @@ | |||
| 28 | (define-public valgrind | 28 | (define-public valgrind |
| 29 | (package | 29 | (package |
| 30 | (name "valgrind") | 30 | (name "valgrind") |
| 31 | (version "3.9.0") | 31 | (version "3.10.0") |
| 32 | (source (origin | 32 | (source (origin |
| 33 | (method url-fetch) | 33 | (method url-fetch) |
| 34 | (uri (string-append "http://valgrind.org/downloads/valgrind-" | 34 | (uri (string-append "http://valgrind.org/downloads/valgrind-" |
| 35 | version ".tar.bz2")) | 35 | version ".tar.bz2")) |
| 36 | (sha256 | 36 | (sha256 |
| 37 | (base32 | 37 | (base32 |
| 38 | "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6")) | 38 | "1jgd42vsx0bcblp91bd61hd5wpy0gghh09wxgm65m666vy17y103")))) |
| 39 | (patches (list (search-patch "valgrind-glibc.patch"))))) | ||
| 40 | (build-system gnu-build-system) | 39 | (build-system gnu-build-system) |
| 41 | (arguments | 40 | (arguments |
| 42 | '(#:phases (alist-cons-after | 41 | '(#:phases (alist-cons-after |
