diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2004-09-27 10:51:49 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2004-09-27 10:51:49 +0000 |
| commit | 45960d175059b23f064528046ca2ff9da12a0921 (patch) | |
| tree | 355b021cf685892f7d52d257926eb5c0c196394d /app-emulation/basiliskII-jit | |
| parent | resolv.conf permissions (Manifest recommit) (diff) | |
| download | gentoo-2-45960d175059b23f064528046ca2ff9da12a0921.tar.gz gentoo-2-45960d175059b23f064528046ca2ff9da12a0921.tar.bz2 gentoo-2-45960d175059b23f064528046ca2ff9da12a0921.zip | |
Patches to fix with gcc-3.4 by fn_x@hotmail.com in bug #65444
Diffstat (limited to 'app-emulation/basiliskII-jit')
| -rw-r--r-- | app-emulation/basiliskII-jit/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/basiliskII-jit/basiliskII-jit-1.0.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | app-emulation/basiliskII-jit/files/basiliskII-jit-gcc34.patch | 29 |
3 files changed, 37 insertions, 3 deletions
diff --git a/app-emulation/basiliskII-jit/ChangeLog b/app-emulation/basiliskII-jit/ChangeLog index 05306943bf68..bf8f8069045d 100644 --- a/app-emulation/basiliskII-jit/ChangeLog +++ b/app-emulation/basiliskII-jit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/basiliskII-jit # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII-jit/ChangeLog,v 1.3 2004/09/02 15:47:46 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII-jit/ChangeLog,v 1.4 2004/09/27 10:51:49 dragonheart Exp $ + + 27 Sep 2004; Daniel Black <dragonheart@gentoo.org> + +files/basiliskII-jit-gcc34.patch, basiliskII-jit-1.0.0-r1.ebuild: + Patches to fix with gcc-3.4 by fn_x@hotmail.com in bug #65444 *basiliskII-jit-1.0.0-r1 (02 Sep 2004) diff --git a/app-emulation/basiliskII-jit/basiliskII-jit-1.0.0-r1.ebuild b/app-emulation/basiliskII-jit/basiliskII-jit-1.0.0-r1.ebuild index 6cab80362fdf..83543ac470d1 100644 --- a/app-emulation/basiliskII-jit/basiliskII-jit-1.0.0-r1.ebuild +++ b/app-emulation/basiliskII-jit/basiliskII-jit-1.0.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII-jit/basiliskII-jit-1.0.0-r1.ebuild,v 1.1 2004/09/02 15:47:46 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/basiliskII-jit/basiliskII-jit-1.0.0-r1.ebuild,v 1.2 2004/09/27 10:51:49 dragonheart Exp $ inherit flag-o-matic @@ -23,12 +23,13 @@ IUSE="X gtk xv esd dga" ### gtk and esd support are compile time options, we'll check the usual ### use variables here and set ./configure options accordingly -DEPEND="gtk? ( x11-libs/gtk+ ) +DEPEND="gtk? ( =x11-libs/gtk+-1.2* ) esd? ( media-sound/esound ) >=sys-apps/sed-4" src_unpack() { unpack ${A} + epatch ${FILESDIR}/basiliskII-jit-gcc34.patch # Fix up the vendor (bug 35352) sed -i \ diff --git a/app-emulation/basiliskII-jit/files/basiliskII-jit-gcc34.patch b/app-emulation/basiliskII-jit/files/basiliskII-jit-gcc34.patch new file mode 100644 index 000000000000..6e80d647edb4 --- /dev/null +++ b/app-emulation/basiliskII-jit/files/basiliskII-jit-gcc34.patch @@ -0,0 +1,29 @@ +--- BasiliskII-jit-1.0.orig/src/uae_cpu/compiler/compemu_atraps.cpp ++++ BasiliskII-jit-1.0/src/uae_cpu/compiler/compemu_atraps.cpp +@@ -69,12 +69,12 @@ + sync_m68k_pc(); + } + +-void REGPARAM2 op_block_move_data_comp_ff(uae_u32 opcode) ++void REGPARAM op_block_move_data_comp_ff(uae_u32 opcode) + { + comp_block_move_data(opcode, false); + } + +-void REGPARAM2 op_block_move_data_comp_nf(uae_u32 opcode) ++void REGPARAM op_block_move_data_comp_nf(uae_u32 opcode) + { + comp_block_move_data(opcode, true); + } +--- BasiliskII-jit-1.0.orig/src/uae_cpu/newcpu.cpp ++++ BasiliskII-jit-1.0/src/uae_cpu/newcpu.cpp +@@ -1331,7 +1331,7 @@ + #ifdef X86_ASSEMBLY + ASM_VOLATILE("\tpushl %%ebp\n\tcall *%%ebx\n\tpopl %%ebp" /* FIXME */ + : : "b" (cpufunctbl[opcode]), "a" (opcode) +- : "%edx", "%ecx", "%esi", "%edi", "%ebp", "memory", "cc"); ++ : "%edx", "%ecx", "%esi", "%edi", "memory", "cc"); + #else + (*cpufunctbl[opcode])(opcode); + #endif + |