summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2015-03-19 23:57:01 +0000
committerAnthony G. Basile <blueness@gentoo.org>2015-03-19 23:57:01 +0000
commit3bf7edbf5ffee71af79775570e39e459e573460a (patch)
treec36b6bd56a46f740433b1a17919326e8e71b6f40 /dev-util/valgrind
parentCopy info page SLOT logic from automake #543730 by Tupone Alfredo. Unify dupl... (diff)
downloadgentoo-2-3bf7edbf5ffee71af79775570e39e459e573460a.tar.gz
gentoo-2-3bf7edbf5ffee71af79775570e39e459e573460a.tar.bz2
gentoo-2-3bf7edbf5ffee71af79775570e39e459e573460a.zip
Patch 3.10.1 to work on linux-4, bug #543648. Thanks Janne Grunau <janne-gentoo@jannau.net>.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'dev-util/valgrind')
-rw-r--r--dev-util/valgrind/ChangeLog7
-rw-r--r--dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch29
-rw-r--r--dev-util/valgrind/valgrind-3.10.1.ebuild5
3 files changed, 39 insertions, 2 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 912a8617b223..ea732c70a4c8 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/valgrind
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.183 2015/03/12 10:05:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.184 2015/03/19 23:57:01 blueness Exp $
+
+ 19 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+ +files/valgrind-3.10.1-linux-4.patch, valgrind-3.10.1.ebuild:
+ Patch 3.10.1 to work on linux-4, bug #543648. Thanks Janne Grunau <janne-
+ gentoo@jannau.net>.
12 Mar 2015; Agostino Sarubbo <ago@gentoo.org> valgrind-3.10.1.ebuild:
Stable for amd64, wrt bug #541952
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
new file mode 100644
index 000000000000..63918c2c1d0e
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
@@ -0,0 +1,29 @@
+From ecb3746d69820905c076b89e1be7042f52ceaa5f Mon Sep 17 00:00:00 2001
+From: Janne Grunau <j@jannau.net>
+Date: Thu, 19 Mar 2015 22:44:51 +0100
+Subject: [PATCH 1/1] configure: support linux 4.*
+
+There is nothing special in linux 4.0. Handle it as another 3.* (or
+another 2.6.*) release. Compare changeset 14955 in valgrind's
+subversion repository. Valgrind trunk also drops support for linux 2.4
+but there is no need to do that for realeased software.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fd2a41..33c7954 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,7 +303,7 @@ case "${host_os}" in
+ kernel=`uname -r`
+
+ case "${kernel}" in
+- 2.6.*|3.*)
++ 2.6.*|3.*|4.*)
+ AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
+ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
+ ;;
+--
+2.3.3
+
diff --git a/dev-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
index 98865e225f25..638b04bff211 100644
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.5 2015/03/12 10:05:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.6 2015/03/19 23:57:01 blueness Exp $
EAPI="4"
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -40,6 +40,9 @@ src_prepare() {
# glibc 2.19 fix
epatch "${FILESDIR}"/${PN}-3.9.0-glibc-2.19.patch
+ # valgrind works fine on linux-4, bug #543648
+ epatch "${FILESDIR}"/${PN}-3.10.1-linux-4.patch
+
# Allow users to test their own patches
epatch_user