Add patch to fix PIC issue (#68140).

Package-Manager: portage-2.0.51.19

5 files changed, 73 insertions, 7 deletions

diff --git a/dev-util/callgrind/ChangeLog b/dev-util/callgrind/ChangeLog
index dbbd674b6ad3..0a1fc26813ee 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.8 2005/04/06 12:25:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/ChangeLog,v 1.9 2005/06/08 18:09:15 greg_g Exp $
+
+*callgrind-0.9.11-r1 (08 Jun 2005)
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/callgrind-0.9.11-pic.patch, +callgrind-0.9.11-r1.ebuild:
+  Add patch to fix PIC issue (#68140).
 
   06 Apr 2005; Caleb Tennis <caleb@gentoo.org> metadata.xml:
   Put myself as maintainer
diff --git a/dev-util/callgrind/Manifest b/dev-util/callgrind/Manifest
index fd79387b2cbe..daed43b926b8 100644
--- a/dev-util/callgrind/Manifest
+++ b/dev-util/callgrind/Manifest
@@ -1,11 +1,14 @@
-MD5 5a66e3a7dae241d8572dec5e332d6b30 callgrind-0.9.10-r1.ebuild 804
+MD5 ce27d2d79c120eec4ba4563651b7e5c1 metadata.xml 261
+MD5 cfa202781d1900ca26f0e2d876c3927e callgrind-0.9.11-r1.ebuild 729
+MD5 de914021beb35e1d740f2a5135b045d6 ChangeLog 1356
 MD5 f6675a8442be1112f82961a1d75004ca callgrind-0.9.11.ebuild 760
-MD5 4bc4ce1cec64b6b16d2e882e080493d1 callgrind-0.9.9.ebuild 757
-MD5 c29406b878c2858094cccaf6e5ca7cfe ChangeLog 1163
+MD5 5a66e3a7dae241d8572dec5e332d6b30 callgrind-0.9.10-r1.ebuild 804
 MD5 d08be8a5ecd0eca00b5453a60015fe2f callgrind-0.9.10.ebuild 758
-MD5 ce27d2d79c120eec4ba4563651b7e5c1 metadata.xml 261
-MD5 e8bd705fcb2d6df113583a3775210fd6 files/digest-callgrind-0.9.10-r1 68
+MD5 4bc4ce1cec64b6b16d2e882e080493d1 callgrind-0.9.9.ebuild 757
+MD5 cd14654b42032ef02a3c219b09c1c667 files/digest-callgrind-0.9.9 67
+MD5 9fec370836b1b35ed92c7fcc97732b29 files/digest-callgrind-0.9.11-r1 68
 MD5 e8bd705fcb2d6df113583a3775210fd6 files/digest-callgrind-0.9.10 68
+MD5 fd019cb535b08fdbae43cb0a32b840cc files/callgrind-0.9.11-pic.patch 796
+MD5 e8bd705fcb2d6df113583a3775210fd6 files/digest-callgrind-0.9.10-r1 68
 MD5 9fec370836b1b35ed92c7fcc97732b29 files/digest-callgrind-0.9.11 68
-MD5 cd14654b42032ef02a3c219b09c1c667 files/digest-callgrind-0.9.9 67
 MD5 477bede0293a25c4565eba10d7a25e41 files/callgrind-sim-pic.patch 725
diff --git a/dev-util/callgrind/callgrind-0.9.11-r1.ebuild b/dev-util/callgrind/callgrind-0.9.11-r1.ebuild
new file mode 100644
index 000000000000..cb5991b5e83a
--- /dev/null
+++ b/dev-util/callgrind/callgrind-0.9.11-r1.ebuild
@@ -0,0 +1,30 @@
+# 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.11-r1.ebuild,v 1.1 2005/06/08 18:09:15 greg_g 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"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=dev-util/valgrind-2.2.0
+	!dev-util/calltree"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-pic.patch"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+	dohtml docs/*.html
+}
diff --git a/dev-util/callgrind/files/callgrind-0.9.11-pic.patch b/dev-util/callgrind/files/callgrind-0.9.11-pic.patch
new file mode 100644
index 000000000000..d1132b5ea604
--- /dev/null
+++ b/dev-util/callgrind/files/callgrind-0.9.11-pic.patch
@@ -0,0 +1,26 @@
+diff -Nur callgrind-0.9.11.orig/src/sim.c callgrind-0.9.11/src/sim.c
+--- callgrind-0.9.11.orig/src/sim.c	2005-04-02 02:31:04.000000000 +0200
++++ callgrind-0.9.11/src/sim.c	2005-06-08 19:52:09.000000000 +0200
+@@ -1177,11 +1177,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.11-r1 b/dev-util/callgrind/files/digest-callgrind-0.9.11-r1
new file mode 100644
index 000000000000..369de67234a6
--- /dev/null
+++ b/dev-util/callgrind/files/digest-callgrind-0.9.11-r1
@@ -0,0 +1 @@
+MD5 a4c41e6b389a14830191f11a92ed8b91 callgrind-0.9.11.tar.gz 265674