adding a patch from bug #68140

(Portage version: 2.0.51.19)

5 files changed, 66 insertions, 1 deletions

diff --git a/dev-util/callgrind/ChangeLog b/dev-util/callgrind/ChangeLog
index 12355cd22ebc..058f2c2d6fd2 100644
--- a/dev-util/callgrind/ChangeLog
+++ b/dev-util/callgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/callgrind
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/ChangeLog,v 1.4 2005/02/11 13:29:39 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/ChangeLog,v 1.5 2005/03/09 13:03:30 caleb Exp $
+
+*callgrind-0.9.10-r1 (09 Mar 2005)
+
+  09 Mar 2005; Caleb Tennis <caleb@gentoo.org> +files/callgrind-sim-pic.patch,
+  +callgrind-0.9.10-r1.ebuild:
+  adding a patch from bug #68140
 
   11 Feb 2005; Caleb Tennis <caleb@gentoo.org> callgrind-0.9.10.ebuild:
   bump to x86 stable
diff --git a/dev-util/callgrind/Manifest b/dev-util/callgrind/Manifest
index df42c62e2f68..a809575bd57e 100644
--- a/dev-util/callgrind/Manifest
+++ b/dev-util/callgrind/Manifest
@@ -1,6 +1,10 @@
+MD5 2a2b82511a4a8fdf0fcff2da63dc4fbd callgrind-0.9.10-r1.ebuild 839
 MD5 4bc4ce1cec64b6b16d2e882e080493d1 callgrind-0.9.9.ebuild 757
+MD5 8ab09f08684a327faff8fd9f0929a448 callgrind-sim-pic.patch 723
 MD5 e5fc1342bf0a6f8be9bf4eef2c3a0990 ChangeLog 618
 MD5 d08be8a5ecd0eca00b5453a60015fe2f callgrind-0.9.10.ebuild 758
 MD5 9096183ca67eb7a38d73e3279b7fbd40 metadata.xml 317
+MD5 e8bd705fcb2d6df113583a3775210fd6 files/digest-callgrind-0.9.10-r1 68
 MD5 e8bd705fcb2d6df113583a3775210fd6 files/digest-callgrind-0.9.10 68
 MD5 cd14654b42032ef02a3c219b09c1c667 files/digest-callgrind-0.9.9 67
+MD5 8ab09f08684a327faff8fd9f0929a448 files/callgrind-sim-pic.patch 723
diff --git a/dev-util/callgrind/callgrind-0.9.10-r1.ebuild b/dev-util/callgrind/callgrind-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..7f9bb3f24afe
--- /dev/null
+++ b/dev-util/callgrind/callgrind-0.9.10-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/callgrind-0.9.10-r1.ebuild,v 1.1 2005/03/09 13:03:30 caleb Exp $
+
+inherit eutils
+
+DESCRIPTION="A plugin for cachegrind that adds call-graph profiling, needed by kcachegrind"
+HOMEPAGE="http://kcachegrind.sourceforge.net/"
+SRC_URI="http://kcachegrind.sourceforge.net/${P}.tar.gz"
+
+KEYWORDS="x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+RDEPEND=">=dev-util/valgrind-2.2.0"
+DEPEND="${RDEPEND}
+	!dev-util/calltree"
+
+src_unpack() {
+    unpack ${A}
+    epatch ${FILESDIR}/callgrind-sim-pic.patch
+}
+
+src_install() {
+	einstall                     || die
+	rm -rf ${D}/usr/share/doc/valgrind
+	dodoc AUTHORS INSTALL README || die "dodoc failed"
+	dohtml docs/*.html           || die "dohtml failed"
+}
diff --git a/dev-util/callgrind/files/callgrind-sim-pic.patch b/dev-util/callgrind/files/callgrind-sim-pic.patch
new file mode 100644
index 000000000000..64b7d49235eb
--- /dev/null
+++ b/dev-util/callgrind/files/callgrind-sim-pic.patch
@@ -0,0 +1,25 @@
+--- callgrind-0.9.10/src/sim.c.orig	2005-01-28 11:40:35.000000000 +0100
++++ callgrind-0.9.10/src/sim.c	2005-01-28 11:50:00.000000000 +0100
+@@ -309,11 +309,22 @@
+ 
+ static __inline__ void cpuid(Int n, UInt *a, UInt *b, UInt *c, UInt *d)
+ {
++#ifdef __PIC__
++   __asm__ __volatile__ (
++    "pushl %%ebx\n\t"\
++    "cpuid\n\t"\
++    "movl %%ebx,%1\n\t"\
++    "popl %%ebx"
++    : "=a" (*a), "=r" (*b), "=c" (*c), "=d" (*d)      /* output */
++    : "0" (n)         /* input */
++    );
++#else
+    __asm__ __volatile__ (
+     "cpuid"
+     : "=a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)      /* output */
+     : "0" (n)         /* input */
+     );
++#endif
+ }
+ 
+ static void micro_ops_warn(Int actual_size, Int used_size, Int line_size)
diff --git a/dev-util/callgrind/files/digest-callgrind-0.9.10-r1 b/dev-util/callgrind/files/digest-callgrind-0.9.10-r1
new file mode 100644
index 000000000000..ba9004c28cbf
--- /dev/null
+++ b/dev-util/callgrind/files/digest-callgrind-0.9.10-r1
@@ -0,0 +1 @@
+MD5 ddfd883491f7d564dca15a2e9336854f callgrind-0.9.10.tar.gz 255698