Fixed valgrind to compile against 2.6.10 kernel headers

(Portage version: 2.0.51.16)

3 files changed, 62 insertions, 2 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index d0bc4748abf6..c5c7c60d98dd 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.41 2005/02/13 15:55:25 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.42 2005/02/22 20:24:09 griffon26 Exp $
+
+  22 Feb 2005; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-2.2.0-current-macro-clash.patch, valgrind-2.2.0-r2.ebuild:
+  Fixed compilation against 2.6.10 kernel headers closing bug #82629 
+  reported by Dennis Schridde <lindevel@gmx.net>.
 
 *valgrind-2.2.0-r2 (13 Feb 2005)
 
diff --git a/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch b/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch
new file mode 100644
index 000000000000..c0b817615756
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-2.2.0-current-macro-clash.patch
@@ -0,0 +1,52 @@
+diff -ruN valgrind-2.2.0/coregrind/vg_syscalls.c valgrind-2.2.0-fixed/coregrind/vg_syscalls.c
+--- valgrind-2.2.0/coregrind/vg_syscalls.c	2004-08-31 02:08:37.000000000 +0200
++++ valgrind-2.2.0-fixed/coregrind/vg_syscalls.c	2005-02-22 20:20:38.904577288 +0100
+@@ -900,7 +900,7 @@
+    Addr ret = VG_(brk_limit);
+    static const Bool debug = False;
+    Segment *seg;
+-   Addr current, newaddr;
++   Addr currentaddr, newaddr;
+ 
+ 
+    if (debug)
+@@ -924,20 +924,20 @@
+    if (seg != NULL && newbrk > seg->addr)
+       return VG_(brk_limit);
+ 
+-   current = PGROUNDUP(VG_(brk_limit));
++   currentaddr = PGROUNDUP(VG_(brk_limit));
+    newaddr = PGROUNDUP(newbrk);
+-   if (newaddr != current) {
++   if (newaddr != currentaddr) {
+ 
+       /* new brk in a new page - fix the mappings */
+       if (newbrk > VG_(brk_limit)) {
+ 	 
+ 	 if (debug)
+ 	    VG_(printf)("  extending brk: current=%p newaddr=%p delta=%d\n",
+-			current, newaddr, newaddr-current);
++			currentaddr, newaddr, newaddr-currentaddr);
+ 
+-	 if (newaddr == current) {
++	 if (newaddr == currentaddr) {
+ 	    ret = newbrk;
+-         } else if ((void*)-1 != VG_(mmap)((void*)current, newaddr-current,
++         } else if ((void*)-1 != VG_(mmap)((void*)currentaddr, newaddr-currentaddr,
+                VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
+                VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS|VKI_MAP_FIXED|VKI_MAP_CLIENT,
+                SF_FIXED|SF_BRK, -1, 0)) 
+@@ -949,10 +949,10 @@
+ 
+ 	 if (debug)
+ 	    VG_(printf)("  shrinking brk: current=%p newaddr=%p delta=%d\n",
+-			current, newaddr, current-newaddr);
++			currentaddr, newaddr, currentaddr-newaddr);
+ 
+-	 if (newaddr != current) {
+-	    int res = VG_(munmap)((void *)newaddr, current - newaddr);
++	 if (newaddr != currentaddr) {
++	    int res = VG_(munmap)((void *)newaddr, currentaddr - newaddr);
+             vg_assert(0 == res);
+ 	 }
+ 	 ret = newbrk;
diff --git a/dev-util/valgrind/valgrind-2.2.0-r2.ebuild b/dev-util/valgrind/valgrind-2.2.0-r2.ebuild
index 59c9b03b6894..2fb183788ac8 100644
--- a/dev-util/valgrind/valgrind-2.2.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.2.0-r2.ebuild,v 1.1 2005/02/13 15:55:25 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-2.2.0-r2.ebuild,v 1.2 2005/02/22 20:24:09 griffon26 Exp $
 
 inherit flag-o-matic eutils
 
@@ -33,6 +33,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-no-exec-stack.patch"
 
+	# To prevent clash with current macro in /usr/include/asm/current.h
+	epatch "${FILESDIR}/${P}-current-macro-clash.patch"
+
 	# make sure our CFLAGS are respected
 	einfo "Changing configure to respect CFLAGS"
 	sed -i -e 's:CFLAGS="":#CFLAGS="":' configure