Re: sid build issues

More sid build issues (thanks Matthias for the 'make -jN' hint!)


6) sid/component/cgen-cpu/mep/Makefile.in comes from Automake 1.9.5;
regenerating it with 1.9.6 leads to this error,
when building on i686-pc-linux-gnu:

| make[7]: *** No rule to make target `mep-ivc2.lo', needed by `libmep.la'.  Stop.
| make[7]: Leaving directory `/tmp/b-386/sid/component/cgen-cpu/mep'

The last ChangeLog entry regarding this Makefile.am is

| 2009-04-30  DJ Delorie  <[email protected]>
| 
|         * Makefile.am: Regenerate.
|         * Makefile.in: Regenerate.
|         * common_model.cxx: Regenerate.
[...]
|         * ivc2-cop.cxx: New.
|         * ivc2-cpu.h: New.
|         * ivc2.h: New.

OK to apply the patch below?

Thanks,
Ralf

sid/component/cgen-cpu/mep/ChangeLog:
2009-08-18  Ralf Wildenhues  <[email protected]>

	* Makefile.am (CPU_SOURCES): Replace mep-ivc2.cxx with
	ivc2-cop.cxx.
	* Makefile.in: Regenerate.

diff --git a/sid/component/cgen-cpu/mep/Makefile.am b/sid/component/cgen-cpu/mep/Makefile.am
index 54741c6..180901f 100644
--- a/sid/component/cgen-cpu/mep/Makefile.am
+++ b/sid/component/cgen-cpu/mep/Makefile.am
@@ -11,7 +11,7 @@ CXXFLAGS = $(TOP_CXXFLAGS) -DHAVE_CONFIG_H
 
 pkgdata_DATA = hw-cpu-mep.txt
 
-CPU_SOURCES = mep-core1-decode.cxx mep-core1-sem.cxx mep-core1-model.cxx mep-cop1-16-decode.cxx mep-cop1-16-sem.cxx mep-cop1-16-model.cxx mep-cop1-32-decode.cxx mep-cop1-32-sem.cxx mep-cop1-32-model.cxx mep-cop1-48-decode.cxx mep-cop1-48-sem.cxx mep-cop1-48-model.cxx mep-cop1-64-decode.cxx mep-cop1-64-sem.cxx mep-cop1-64-model.cxx mep-ivc2.cxx
+CPU_SOURCES = mep-core1-decode.cxx mep-core1-sem.cxx mep-core1-model.cxx mep-cop1-16-decode.cxx mep-cop1-16-sem.cxx mep-cop1-16-model.cxx mep-cop1-32-decode.cxx mep-cop1-32-sem.cxx mep-cop1-32-model.cxx mep-cop1-48-decode.cxx mep-cop1-48-sem.cxx mep-cop1-48-model.cxx mep-cop1-64-decode.cxx mep-cop1-64-sem.cxx mep-cop1-64-model.cxx ivc2-cop.cxx
 
 libmep_la_SOURCES = mep.cxx common_model.cxx mep-decode.cxx mep-sem.cxx mep-model.cxx $(CPU_SOURCES)
 libmep_la_LDFLAGS =



7) On Cygwin, a native src build with
  --disable-shared --disable-binutils

fails (after fixing or working around previously mentioned errors)
inside sid/ with:

| Making all in fpu
| make[8]: Entering directory `/tmp/build/sid/component/bochs/cpu/fpu'
| if /bin/sh ../../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../../../../../../src/sid/component/bochs/cpu/fpu -I../.. -I../../../../../../src/sid/component/bochs/cpu/fpu/../.. -I../../../../../../src/sid/component/bochs/cpu/fpu -I../../../../../../src/sid/component/bochs/cpu/fpu/stubs -DUSE_WITH_CPU_SIM -DPARANOID -DNO_ASSEMBLER    -g -O2 -MT wmFPUemu_glue.lo -MD -MP -MF ".deps/wmFPUemu_glue.Tpo" -c -o wmFPUemu_glue.lo ../../../../../../src/sid/component/bochs/cpu/fpu/wmFPUemu_glue.cc; \
| 	then mv -f ".deps/wmFPUemu_glue.Tpo" ".deps/wmFPUemu_glue.Plo"; else rm -f ".deps/wmFPUemu_glue.Tpo"; exit 1; fi
|  g++ -DHAVE_CONFIG_H -I. -I../../../../../../src/sid/component/bochs/cpu/fpu -I../.. -I../../../../../../src/sid/component/bochs/cpu/fpu/../.. -I../../../../../../src/sid/component/bochs/cpu/fpu -I../../../../../../src/sid/component/bochs/cpu/fpu/stubs -DUSE_WITH_CPU_SIM -DPARANOID -DNO_ASSEMBLER -g -O2 -MT wmFPUemu_glue.lo -MD -MP -MF .deps/wmFPUemu_glue.Tpo -c ../../../../../../src/sid/component/bochs/cpu/fpu/wmFPUemu_glue.cc -o wmFPUemu_glue.o
| In file included from ../../../../../../src/sid/component/bochs/cpu/fpu/fpu_emu.h:82,
|                  from ../../../../../../src/sid/component/bochs/cpu/fpu/wmFPUemu_glue.cc:32:
| ../../../../../../src/sid/component/bochs/cpu/fpu/stubs/asm/sigcontext.h:17: error: redefinition of `struct _fpstate'
| /usr/include/cygwin/signal.h:18: error: previous definition of `struct _fpstate'
| make[8]: *** [wmFPUemu_glue.lo] Error 1
| make[8]: Leaving directory `/tmp/build/sid/component/bochs/cpu/fpu'
| make[8]: Entering directory `/tmp/build/sid/component/bochs/cpu'
| make[8]: *** No rule to make target `fpu/libfpu.la', needed by `libcpu.la'.  Stop.

Here, the _fpstate in sid has a 'struct _fpreg _st[8]; unsigned long
status;' where cygwin has a 'char _st[80]; unsigned long nxst;'.

Help?

Thanks,
Ralf