Add patch to enable building with PIC #77079 by lukenshiro@ngi.it.

4 files changed, 39 insertions, 12 deletions

diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index 36b117154f0c..efab770d644a 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ode
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.11 2005/01/07 19:30:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.12 2005/01/08 05:53:40 vapier Exp $
+
+  08 Jan 2005; Mike Frysinger <vapier@gentoo.org> +files/0.5-PIC.patch,
+  ode-0.5-r2.ebuild:
+  Add patch to enable building with PIC #77079 by lukenshiro@ngi.it.
 
 *ode-0.5-r2 (07 Jan 2005)
 
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index f2ce456b789b..36a5cb4b97b4 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0a1efa9cb7ea7a8804c6c19a6e4aa33e ChangeLog 2325
+MD5 d4315ba10979b6441acb5455fe97dbe4 ChangeLog 2488
 MD5 897a7d200c1e7b0159d465d3220c9eff metadata.xml 509
-MD5 b4709bc0bef23c162eb71bb15ee30bd4 ode-0.5-r2.ebuild 1675
+MD5 140f4ebb7664313fdc0c27e00cb26844 ode-0.5-r2.ebuild 1711
 MD5 24a10f16623003a6f4c8df5d8a0c11f5 files/digest-ode-0.5-r2 57
+MD5 e220c14da604140bcfe43dc34832b10e files/0.5-PIC.patch 450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB3uNJroRuSHgZdywRAmv6AJ9sPcT9/1EK8vRhWxFI6liv2NrR7gCfchR6
-kPIjqwpWMPF3ugt9Z4iPT90=
-=WgFu
+iD8DBQFB33V8roRuSHgZdywRAiecAJ99EtLJqMh1IxRpZxpNHDGf4nQgEACeMSWi
+r4nkNmRXTI7igzyWWrW/44w=
+=FOdg
 -----END PGP SIGNATURE-----
diff --git a/dev-games/ode/files/0.5-PIC.patch b/dev-games/ode/files/0.5-PIC.patch
new file mode 100644
index 000000000000..b4fb9aaaa692
--- /dev/null
+++ b/dev-games/ode/files/0.5-PIC.patch
@@ -0,0 +1,18 @@
+Make sure we don't clobber %ebx (important with PIC).
+
+http://bugs.gentoo.org/show_bug.cgi?id=77079
+
+--- ode-0.5/ode/src/timer.cpp.orig	2005-01-08 00:42:12.799324632 -0500
++++ ode-0.5/ode/src/timer.cpp	2005-01-08 00:42:38.347440728 -0500
+@@ -118,8 +118,10 @@
+ {
+   asm volatile (
+ 	"mov $0,%%eax\n"
++	"pushl %%ebx\n"
+ 	"cpuid\n"
+-	: : : "%eax","%ebx","%ecx","%edx","cc","memory");
++	"popl %%ebx\n"
++	: : : "%eax","%ecx","%edx","cc","memory");
+ }
+ 
+ 
diff --git a/dev-games/ode/ode-0.5-r2.ebuild b/dev-games/ode/ode-0.5-r2.ebuild
index c62a739a2f27..f277905a374e 100644
--- a/dev-games/ode/ode-0.5-r2.ebuild
+++ b/dev-games/ode/ode-0.5-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.5-r2.ebuild,v 1.1 2005/01/07 19:30:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.5-r2.ebuild,v 1.2 2005/01/08 05:53:40 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Open Dynamics Engine SDK"
 HOMEPAGE="http://ode.org/"
@@ -18,16 +20,18 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-	echo 'C_FLAGS+=$(E_CFLAGS) -fPIC' >> "${S}"/config/makefile.unix-gcc
+	cd "${S}"
+	echo 'C_FLAGS+=$(E_CFLAGS) -fPIC' >> config/makefile.unix-gcc
+	epatch "${FILESDIR}"/${PV}-PIC.patch
 	if use debug ; then
 		sed -i \
 			-e "s/#BUILD=d/BUILD=d/" \
 			-e "s/BUILD=r/#BUILD=r/" \
-			"${S}"/config/user-settings
+			config/user-settings
 	fi
-	sed -i -e "s/#OPCODE_DIRECTORY/OPCODE_DIRECTORY/" ${S}/config/user-settings
-	sed -i -e 's/..\/..\/drawstuff\/textures/.\//' ${S}/ode/test/*.c*
-	sed -i -e 's/fn.path_to_textures = 0/fn.path_to_textures = ".\/"/' ${S}/drawstuff/dstest/dstest.cpp
+	sed -i -e "s/#OPCODE_DIRECTORY/OPCODE_DIRECTORY/" config/user-settings
+	sed -i -e 's/..\/..\/drawstuff\/textures/.\//' ode/test/*.c*
+	sed -i -e 's/fn.path_to_textures = 0/fn.path_to_textures = ".\/"/' drawstuff/dstest/dstest.cpp
 }
 
 src_compile() {