Added gcc3 fix. Closes #29523

4 files changed, 93 insertions, 10 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 58faadbf13a1..868650ee96d2 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.11 2003/09/25 13:04:50 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.12 2003/09/29 20:28:26 mholzer Exp $
+
+  29 Sep 2003; Martin Holzer <mholzer@gentoo.org> bochs-2.0.2.ebuild,
+  files/bochs-2.0.2-gcc3.patch:
+  Added gcc3 fix. Closes #29523
 
   25 Sep 2003; Tavis Ormandy <taviso@gentoo.org> bochs-2.0.2.ebuild:
   testing on alpha (~alpha)
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index 746ce920f4ed..3307277f1304 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,9 +1,10 @@
-MD5 44d0eed7e91d9d7e3306a87383b76bba bochs-2.0.ebuild 1492
-MD5 887420e60dbb71b6c6736f5e170e4484 bochs-1.4.ebuild 1519
-MD5 b75637b494d84ff76bf7985da9946d9a bochs-2.0.2.ebuild 1546
+MD5 3d558661ceb3899868de20418cee617b ChangeLog 1368
 MD5 3fc3de44c4d8ea336e2e8c3e65984593 bochs-1.4.1.ebuild 1589
-MD5 66703e597b129ccdee46e5ce6d5aed0b ChangeLog 1232
-MD5 45eecf87d56bd4562cffd0c8cfe666f9 files/digest-bochs-1.4.1 126
-MD5 26ca4f540fd4c1765283dbf79a9d4e7e files/digest-bochs-2.0.2 126
+MD5 887420e60dbb71b6c6736f5e170e4484 bochs-1.4.ebuild 1519
+MD5 141c15f6a0753097f8df88806312a481 bochs-2.0.2.ebuild 1593
+MD5 44d0eed7e91d9d7e3306a87383b76bba bochs-2.0.ebuild 1492
 MD5 98e5b3f35a6f0ad02450764b07b344f6 files/digest-bochs-1.4 124
+MD5 45eecf87d56bd4562cffd0c8cfe666f9 files/digest-bochs-1.4.1 126
 MD5 b16ead839f74b3e086e97173022acc75 files/digest-bochs-2.0 124
+MD5 26ca4f540fd4c1765283dbf79a9d4e7e files/digest-bochs-2.0.2 126
+MD5 82bbe1a668c392d41dab00e073bf4e05 files/bochs-2.0.2-gcc3.patch 2206
diff --git a/app-emulation/bochs/bochs-2.0.2.ebuild b/app-emulation/bochs/bochs-2.0.2.ebuild
index ca9f7b685a36..981f6b35d6cb 100644
--- a/app-emulation/bochs/bochs-2.0.2.ebuild
+++ b/app-emulation/bochs/bochs-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.0.2.ebuild,v 1.5 2003/09/25 13:04:50 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.0.2.ebuild,v 1.6 2003/09/29 20:28:26 mholzer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Bochs is a pc emulator.
@@ -23,13 +23,14 @@ KEYWORDS="x86 ~ppc ~alpha"
 
 src_unpack() {
 	unpack ${P}.tar.gz
+	cd ${S}
 
 	sed -i \
 	-e "s:\$(WGET) \$(DLXLINUX_TAR_URL):cp ${DISTDIR}/dlxlinux3.tar.gz .:" \
 	-e 's:BOCHSDIR=:BOCHSDIR=/usr/lib/bochs#:' \
-	-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' ${S}/Makefile.in || \
+	-e 's: $(BOCHSDIR): $(DESTDIR)$(BOCHSDIR):g' Makefile.in || \
 		die "sed Makefile.in failed"
-
+	epatch ${FILESDIR}/${P}-gcc3.patch || die
 }
 
 src_compile() {
diff --git a/app-emulation/bochs/files/bochs-2.0.2-gcc3.patch b/app-emulation/bochs/files/bochs-2.0.2-gcc3.patch
new file mode 100644
index 000000000000..a343125df9b5
--- /dev/null
+++ b/app-emulation/bochs/files/bochs-2.0.2-gcc3.patch
@@ -0,0 +1,77 @@
+diff -Naur bochs-2.0.2-orig/cpu/fetchdecode.cc bochs-2.0.2/cpu/fetchdecode.cc
+--- bochs-2.0.2-orig/cpu/fetchdecode.cc	2003-01-22 14:18:30.000000000 +0100
++++ bochs-2.0.2/cpu/fetchdecode.cc	2003-09-24 18:25:28.000000000 +0200
+@@ -160,53 +160,53 @@
+ } BxOpcodeInfo_t;
+ 
+ static BxOpcodeInfo_t opcodesADD_EwIw[2] = {
+-  { 0,  { &BX_CPU_C::ADD_EEwIw } },
+-  { 0,  { &BX_CPU_C::ADD_EGwIw } }
++  { 0,  &BX_CPU_C::ADD_EEwIw },
++  { 0,  &BX_CPU_C::ADD_EGwIw }
+   };
+ 
+ static BxOpcodeInfo_t opcodesADD_EdId[2] = {
+-  { 0,  { &BX_CPU_C::ADD_EEdId } },
+-  { 0,  { &BX_CPU_C::ADD_EGdId } }
++  { 0,  &BX_CPU_C::ADD_EEdId },
++  { 0,  &BX_CPU_C::ADD_EGdId }
+   };
+ 
+ static BxOpcodeInfo_t opcodesADD_GwEw[2] = {
+-  { 0,  { &BX_CPU_C::ADD_GwEEw } },
+-  { 0,  { &BX_CPU_C::ADD_GwEGw } }
++  { 0,  &BX_CPU_C::ADD_GwEEw },
++  { 0,  &BX_CPU_C::ADD_GwEGw }
+   };
+ 
+ static BxOpcodeInfo_t opcodesADD_GdEd[2] = {
+-  { 0,  { &BX_CPU_C::ADD_GdEEd } },
+-  { 0,  { &BX_CPU_C::ADD_GdEGd } }
++  { 0,  &BX_CPU_C::ADD_GdEEd },
++  { 0,  &BX_CPU_C::ADD_GdEGd }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_GbEb[2] = {
+-  { 0,  { &BX_CPU_C::MOV_GbEEb } },
+-  { 0,  { &BX_CPU_C::MOV_GbEGb } }
++  { 0,  &BX_CPU_C::MOV_GbEEb },
++  { 0,  &BX_CPU_C::MOV_GbEGb }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_GwEw[2] = {
+-  { 0,  { &BX_CPU_C::MOV_GwEEw } },
+-  { 0,  { &BX_CPU_C::MOV_GwEGw } }
++  { 0,  &BX_CPU_C::MOV_GwEEw },
++  { 0,  &BX_CPU_C::MOV_GwEGw }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_GdEd[2] = {
+-  { 0,  { &BX_CPU_C::MOV_GdEEd } },
+-  { 0,  { &BX_CPU_C::MOV_GdEGd } }
++  { 0,  &BX_CPU_C::MOV_GdEEd },
++  { 0,  &BX_CPU_C::MOV_GdEGd }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_EbGb[2] = {
+-  { 0,  { &BX_CPU_C::MOV_EEbGb } },
+-  { 0,  { &BX_CPU_C::MOV_EGbGb } }
++  { 0,  &BX_CPU_C::MOV_EEbGb },
++  { 0,  &BX_CPU_C::MOV_EGbGb }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_EwGw[2] = {
+-  { 0,  { &BX_CPU_C::MOV_EEwGw } },
+-  { 0,  { &BX_CPU_C::MOV_EGwGw } }
++  { 0,  &BX_CPU_C::MOV_EEwGw },
++  { 0,  &BX_CPU_C::MOV_EGwGw }
+   };
+ 
+ static BxOpcodeInfo_t opcodesMOV_EdGd[2] = {
+-  { 0,  { &BX_CPU_C::MOV_EEdGd } },
+-  { 0,  { &BX_CPU_C::MOV_EGdGd } }
++  { 0,  &BX_CPU_C::MOV_EEdGd },
++  { 0,  &BX_CPU_C::MOV_EGdGd }
+   };
+ 
+ /* ********** */