Fixed valgrind to compile against 2.6.10 kernel headers

Package-Manager: portage-2.0.51.16

4 files changed, 69 insertions, 8 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/Manifest b/dev-util/valgrind/Manifest
index 6b3b9317676a..37121114ecca 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
 MD5 4871b943d694b8d009f993c244356257 valgrind-2.2.0-r1.ebuild 1428
-MD5 858f9b45289860be33b5ad306ab24ec4 ChangeLog 2659
-MD5 56c234fea4ecbeb1a5337ab118ebb04f valgrind-2.2.0-r2.ebuild 1594
+MD5 46281e9050feb774ded81bb7f2d3a4c1 ChangeLog 2915
 MD5 be4e2e968179239e51aafd78be4d95af valgrind-2.0.0.ebuild 1172
 MD5 e6dc16df8e136f735bc577092f7b6383 valgrind-2.1.0.ebuild 1017
 MD5 7e4a680daca3ed212226f6364c958420 valgrind-2.1.1-r1.ebuild 1143
 MD5 07f48be25380e77aa5a44fec2b408998 valgrind-2.1.1.ebuild 925
 MD5 b99a507d5351da63d87c61f3fe0072ad valgrind-2.1.2.ebuild 1101
 MD5 2371f70b5ed5e88767cade219fd7cc65 valgrind-2.2.0.ebuild 1388
+MD5 8884d8b887013cbc4f5a865135b5f24b valgrind-2.2.0-r2.ebuild 1717
 MD5 286d10f4514e8a85360ce6ba5654ae93 files/digest-valgrind-2.0.0 67
 MD5 a69fe5652a8ca5fb1d04521fe0c56850 files/digest-valgrind-2.1.0 138
 MD5 f50184c09d0376e66b1b79d0b45e94c2 files/digest-valgrind-2.1.1 67
@@ -23,10 +23,11 @@ MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0 139
 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r1 139
 MD5 fc1dda2b6f2603a4244ad25f555f2034 files/valgrind-2.2.0-no-exec-stack.patch 1711
 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
+MD5 d10a593e8cb1c5074c438adc226d1c81 files/valgrind-2.2.0-current-macro-clash.patch 1871
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCD3h2MGnpIbeahxwRAnboAKCz9OTULAmPtF5xyszIqoQSJGGlqgCgg0Jv
-+c6Ma4p5DsPO9l6K+ul4UP4=
-=xKxH
+iD8DBQFCG5TzMGnpIbeahxwRAgn8AJ0UTOFAlccIu8Hv2c2iwf7uggALewCgqDaP
+1UGF1tb9coTdFlybrLO/tfA=
+=n3e7
 -----END PGP SIGNATURE-----
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