gnu: valgrind: Update to 3.11.0.
* gnu/packages/valgrind.scm (valgrind): Update to 3.11.0. [source]: Remove the patches * gnu/packages/patches/valgrind-glibc-2.22.patch, gnu/packages/patches/valgrind-linux-libre-4.x.patch: Delete files. * gnu-system.am (dist_patch_DATA): Unregister the patches.
This commit is contained in:
parent
127cbd85c0
commit
2f8fee0623
|
@ -647,8 +647,6 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/unzip-remove-build-date.patch \
|
gnu/packages/patches/unzip-remove-build-date.patch \
|
||||||
gnu/packages/patches/util-linux-tests.patch \
|
gnu/packages/patches/util-linux-tests.patch \
|
||||||
gnu/packages/patches/upower-builddir.patch \
|
gnu/packages/patches/upower-builddir.patch \
|
||||||
gnu/packages/patches/valgrind-glibc-2.22.patch \
|
|
||||||
gnu/packages/patches/valgrind-linux-libre-4.x.patch \
|
|
||||||
gnu/packages/patches/vpnc-script.patch \
|
gnu/packages/patches/vpnc-script.patch \
|
||||||
gnu/packages/patches/vtk-mesa-10.patch \
|
gnu/packages/patches/vtk-mesa-10.patch \
|
||||||
gnu/packages/patches/w3m-fix-compile.patch \
|
gnu/packages/patches/w3m-fix-compile.patch \
|
||||||
|
|
|
@ -1,39 +0,0 @@
|
||||||
Submitted By: Pierre Labastie <pierre at linuxfromscratch dot org>
|
|
||||||
Date: 2015-02-22
|
|
||||||
Initial Package Version: 3.10.1
|
|
||||||
Upstream Status: Unknown
|
|
||||||
Origin: Self
|
|
||||||
Description: Allows Valgrind to build with glibc-2.21
|
|
||||||
|
|
||||||
Later modified to support glibc-2.22 as well.
|
|
||||||
|
|
||||||
diff -Naur valgrind-3.10.1.old/configure valgrind-3.10.1.new/configure
|
|
||||||
--- valgrind-3.10.1.old/configure 2014-11-25 20:42:25.000000000 +0100
|
|
||||||
+++ valgrind-3.10.1.new/configure 2015-02-22 10:46:06.607826488 +0100
|
|
||||||
@@ -6842,6 +6842,26 @@
|
|
||||||
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
|
||||||
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
|
||||||
;;
|
|
||||||
+ 2.21)
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.21 family" >&5
|
|
||||||
+$as_echo "2.21 family" >&6; }
|
|
||||||
+
|
|
||||||
+$as_echo "#define GLIBC_2_21 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}"
|
|
||||||
+ ;;
|
|
||||||
+ 2.22)
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.22 family" >&5
|
|
||||||
+$as_echo "2.22 family" >&6; }
|
|
||||||
+
|
|
||||||
+$as_echo "#define GLIBC_2_22 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; }
|
|
|
@ -1,18 +0,0 @@
|
||||||
Modify valgrind's configure script to accept linux-libre-4.x as being in the
|
|
||||||
same family as 3.x.
|
|
||||||
|
|
||||||
--- valgrind-3.10.1/configure 2015-09-15 18:02:20.710262686 -0400
|
|
||||||
+++ valgrind-3.10.1/configure 2015-09-15 18:02:59.831829731 -0400
|
|
||||||
@@ -5553,9 +5553,9 @@
|
|
||||||
kernel=`uname -r`
|
|
||||||
|
|
||||||
case "${kernel}" in
|
|
||||||
- 2.6.*|3.*)
|
|
||||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5
|
|
||||||
-$as_echo "2.6.x/3.x family (${kernel})" >&6; }
|
|
||||||
+ 2.6.*|3.*|4.*)
|
|
||||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x/4.x family (${kernel})" >&5
|
|
||||||
+$as_echo "2.6.x/3.x/4.x family (${kernel})" >&6; }
|
|
||||||
|
|
||||||
$as_echo "#define KERNEL_2_6 1" >>confdefs.h
|
|
||||||
|
|
|
@ -30,16 +30,14 @@
|
||||||
(define-public valgrind
|
(define-public valgrind
|
||||||
(package
|
(package
|
||||||
(name "valgrind")
|
(name "valgrind")
|
||||||
(version "3.10.1")
|
(version "3.11.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://valgrind.org/downloads/valgrind-"
|
(uri (string-append "http://valgrind.org/downloads/valgrind-"
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"))
|
"0hiv871b9bk689mv42mkhp76za78l5773glszfkdbpf1m1qn4fbc"))))
|
||||||
(patches (map search-patch '("valgrind-glibc-2.22.patch"
|
|
||||||
"valgrind-linux-libre-4.x.patch")))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases (alist-cons-after
|
'(#:phases (alist-cons-after
|
||||||
|
|
Loading…
Reference in New Issue