diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-01-08 05:53:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-08 05:53:40 +0000 |
| commit | 447b0bf5db1a7b6a830cf134299ceab5c7b7fb85 (patch) | |
| tree | 5c20db4d310ee5bccb2a402b868e5b49ce555031 /dev-games | |
| parent | config fix (Manifest recommit) (diff) | |
| download | gentoo-2-447b0bf5db1a7b6a830cf134299ceab5c7b7fb85.tar.gz gentoo-2-447b0bf5db1a7b6a830cf134299ceab5c7b7fb85.tar.bz2 gentoo-2-447b0bf5db1a7b6a830cf134299ceab5c7b7fb85.zip | |
Add patch to enable building with PIC #77079 by lukenshiro@ngi.it.
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/ode/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/ode/files/0.5-PIC.patch | 18 | ||||
| -rw-r--r-- | dev-games/ode/ode-0.5-r2.ebuild | 16 |
3 files changed, 33 insertions, 7 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/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() { |