diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-09-15 18:18:46 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-09-15 18:21:16 -0400 |
| commit | 1d6c8db57cbcd26994e3c6f0b4662bd783166bbf (patch) | |
| tree | fa0b8258a401ccc4f6a0a3054db7b741b2d4da7d /gnu/packages/patches | |
| parent | b76b1dcb9694a8b87669ae0de910b811c9f305a8 (diff) | |
| download | guix-1d6c8db57cbcd26994e3c6f0b4662bd783166bbf.tar.gz | |
gnu: valgrind: Adapt to glibc-2.22 and linux-libre-4.x.
* gnu/packages/patches/valgrind-glibc-2.21.patch: Rename to ... gnu/packages/patches/valgrind-glibc-2.22.patch: ... this, and add a case for glibc-2.22. * gnu/packages/patches/valgrind-linux-libre-4.x.patch: New file. * gnu-system.am (dist_patch_DATA): Add the new file, and rename the other one. * gnu/packages/valgrind.scm (valgrind)[source]: Add new patch.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/valgrind-glibc-2.22.patch (renamed from gnu/packages/patches/valgrind-glibc-2.21.patch) | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/valgrind-linux-libre-4.x.patch | 18 |
2 files changed, 32 insertions, 1 deletions
diff --git a/gnu/packages/patches/valgrind-glibc-2.21.patch b/gnu/packages/patches/valgrind-glibc-2.22.patch index 70f809c43f..36c4916cc6 100644 --- a/gnu/packages/patches/valgrind-glibc-2.21.patch +++ b/gnu/packages/patches/valgrind-glibc-2.22.patch @@ -4,10 +4,13 @@ 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,16 @@ +@@ -6842,6 +6842,26 @@ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; @@ -21,6 +24,16 @@ diff -Naur valgrind-3.10.1.old/configure valgrind-3.10.1.new/configure + 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; } diff --git a/gnu/packages/patches/valgrind-linux-libre-4.x.patch b/gnu/packages/patches/valgrind-linux-libre-4.x.patch new file mode 100644 index 0000000000..79166619c7 --- /dev/null +++ b/gnu/packages/patches/valgrind-linux-libre-4.x.patch @@ -0,0 +1,18 @@ +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 + |