ports/54440: emulators/bochs doesn't compile on -current (patch included)

[Erik Greenwald]

>Number:         54440
>Category:       ports
>Synopsis:       emulators/bochs doesn't compile on -current (patch included)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 13 08:40:05 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Erik Greenwald
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD fenris 5.1-CURRENT FreeBSD 5.1-CURRENT #8: Sat Jul 12 22:57:38 CDT 2003 root at fenris:/usr/src/sys/i386/compile/FENRIS i386


>Description:


===>  Building for bochs-2.0.2,1
cd iodev && \
gmake  libiodev.a
gmake[1]: Entering directory `/usr/ports/emulators/bochs/work/bochs-2.0.2/iodev'
gmake[1]: `libiodev.a' is up to date.
gmake[1]: Leaving directory `/usr/ports/emulators/bochs/work/bochs-2.0.2/iodev'
echo done
done
cd cpu && \
gmake  libcpu.a
gmake[1]: Entering directory `/usr/ports/emulators/bochs/work/bochs-2.0.2/cpu'
c++ -c -I.. -I./.. -I../instrument/stubs -I./../instrument/stubs -O -pipe -march=athlon -fno-rtti -fno-exceptions -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES   fetchdecode.cc -o fetchdecode.o
gmake[1]: Leaving directory `/usr/ports/emulators/bochs/work/bochs-2.0.2/cpu'
fetchdecode.cc:165: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:165: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:170: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:170: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:175: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:175: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:180: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:180: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:185: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:185: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:190: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:190: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:195: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:195: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:200: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:200: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:205: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:205: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:210: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
fetchdecode.cc:210: error: brace-enclosed initializer used to initialize `void 
   (*)(bxInstruction_c*)'
gmake[1]: *** [fetchdecode.o] Error 1
gmake: *** [cpu/libcpu.a] Error 2
*** Error code 2

Stop in /usr/ports/emulators/bochs.

>How-To-Repeat:

try building with new -current

>Fix:

	

--- bochs.patch begins here ---
diff -Nurb emulators/bochs.orig/files/patch-cpu::fetchdecode.cc emulators/bochs/files/patch-cpu::fetchdecode.cc
--- emulators/bochs.orig/files/patch-cpu::fetchdecode.cc	Wed Dec 31 18:00:00 1969
+++ emulators/bochs/files/patch-cpu::fetchdecode.cc	Sun Jul 13 10:10:56 2003
@@ -0,0 +1,76 @@
+--- cpu/fetchdecode.cc.orig	Wed Jan 22 07:18:30 2003
++++ cpu/fetchdecode.cc	Sun Jul 13 10:09:27 2003
+@@ -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 }
+   };
+ 
+ /* ********** */
--- bochs.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: