[PATCH] gnu: valgrind: Fix build against glibc 2.21

[PATCH] gnu: valgrind: Fix build against glibc 2.21

[Tomáš Čech]

* gnu/packages/patches/valgrind-glibc_version.patch: New file.
* gnu-system.am (dist_patch_DATA): Add the patch.
* gnu/packages/valgrind.scm (valgrind): Apply the patch.
---
 gnu-system.am                                     |  1 +
 gnu/packages/patches/valgrind-glibc_version.patch | 26 +++++++++++++++++++++++
 gnu/packages/valgrind.scm                         |  3 ++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/valgrind-glibc_version.patch

diff --git a/gnu-system.am b/gnu-system.am
index a10dd33..91b8014 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -528,6 +528,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/unzip-CVE-2014-8140.patch		\
   gnu/packages/patches/unzip-CVE-2014-8141.patch		\
   gnu/packages/patches/util-linux-tests.patch			\
+  gnu/packages/patches/valgrind-glibc_version.patch		\
   gnu/packages/patches/vpnc-script.patch			\
   gnu/packages/patches/vtk-mesa-10.patch			\
   gnu/packages/patches/w3m-fix-compile.patch			\
diff --git a/gnu/packages/patches/valgrind-glibc_version.patch b/gnu/packages/patches/valgrind-glibc_version.patch
new file mode 100644
index 0000000..70f809c
--- /dev/null
+++ b/gnu/packages/patches/valgrind-glibc_version.patch
@@ -0,0 +1,26 @@
+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
+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 @@
+ 	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}"
++	;;
+      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 f051c68..84ec55a 100644
--- a/gnu/packages/valgrind.scm
+++ b/gnu/packages/valgrind.scm
@@ -36,7 +36,8 @@
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"))))
+               "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"))
+             (patches (list (search-patch "valgrind-glibc_version.patch")))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (alist-cons-after
-- 
2.0.5

Re: [PATCH] gnu: valgrind: Fix build against glibc 2.21

[Andreas Enge]

I had a look yesterday and wanted to make a patch this evening, but you
beat me to it! This looks a lot like what I wanted to do, so please push.

A tiny bit of nitpicking:

On Fri, Mar 06, 2015 at 06:02:01PM +0100, Tomáš Čech wrote:
> +  gnu/packages/patches/valgrind-glibc_version.patch		\

We usually use '-' instead of '_', so I would call it
valgrind-glibc-version.patch .

Or maybe valgrind-glibc-2.21.patch .

Andreas

PS: The funny thing is that the error message states that valgrind needs
    glibc up to 2.19, while the configure script already supports 2.20.

Re: [PATCH] gnu: valgrind: Fix build against glibc 2.21

[tcech]

[-- Attachment #1: Type: text/plain, Size: 823 bytes --]

On Fri, Mar 06, 2015 at 07:41:28PM +0100, Andreas Enge wrote:
>I had a look yesterday and wanted to make a patch this evening, but you
>beat me to it! This looks a lot like what I wanted to do, so please push.
>
>A tiny bit of nitpicking:

You're fast as usual :b
Thanks!

>
>On Fri, Mar 06, 2015 at 06:02:01PM +0100, Tomáš Čech wrote:
>> +  gnu/packages/patches/valgrind-glibc_version.patch		\
>
>We usually use '-' instead of '_', so I would call it
>valgrind-glibc-version.patch .

Argh. OK.

>
>Or maybe valgrind-glibc-2.21.patch .

Original file name was

http://www.linuxfromscratch.org/patches/blfs/svn/valgrind-3.10.1-glibc_2.21-1.patch

which is something I'm used to as well, but I was told to remove
version from patch file name last time so I did it this time as
well...

S_W


[-- Attachment #2: Type: application/pgp-signature, Size: 181 bytes --]