From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= Subject: [PATCH] gnu: valgrind: Fix build against glibc 2.21 Date: Fri, 6 Mar 2015 18:02:01 +0100 Message-ID: <1425661321-12432-1-git-send-email-sleep_walker@suse.cz> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTvdb-0008MB-IS for guix-devel@gnu.org; Fri, 06 Mar 2015 12:02:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTvdX-0005IQ-3C for guix-devel@gnu.org; Fri, 06 Mar 2015 12:02:11 -0500 Received: from cantor2.suse.de ([195.135.220.15]:56060 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTvdW-0005Hu-TB for guix-devel@gnu.org; Fri, 06 Mar 2015 12:02:07 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3EE77ABA2 for ; Fri, 6 Mar 2015 17:02:05 +0000 (UTC) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * 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 +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