2003/09/06 22:23:36

[org.ibex.core.git] / upstream / Makefile

diff --git a/upstream/Makefile b/upstream/Makefile
index c6d1e96..c6e03cf 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -9,8 +9,8 @@ packages               := jikes-1.18 binutils-2.13.2.1 newlib-1.11.0 w32api-2.3
 # where to get stuff
 url_newlib-1.11.0      := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz
 url_binutils-2.13.2.1  := ftp://ftp.gnu.org/gnu/binutils/binutils-2.13.2.1.tar.gz 
-url_w32api-2.3         := http://twtelecom.dl.sourceforge.net/sourceforge/mingw/w32api-2.3.tar.gz
-url_mingw-runtime-3.0  := http://twtelecom.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.0.tar.gz
+url_w32api-2.3         := http://umn.dl.sourceforge.net/sourceforge/mingw/w32api-2.3.tar.gz
+url_mingw-runtime-3.0  := http://umn.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.0.tar.gz
 url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz
 url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
@@ -19,7 +19,7 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
 # how to configure it
 configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static
-configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as
+configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as --enable-libgcj
 configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization
 configure_gcc-3.3-i686-pc-mingw32       := --enable-threads=win32 --enable-hash-synchronization
 configure_gcc-3.3-i686-pc-linux-gnu     := --enable-threads=posix --enable-hash-synchronization
@@ -28,15 +28,21 @@ configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-new
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
 .jikes:
-       echo "jikes " > .jikes
-       (type jikes && (jikes --version | grep "Version 1.18")) || \
-               (make jikes-1.18/src jikes-1.18/.installed && echo -n "upstream/install/bin/jikes " > .jikes)
+       echo "#!/bin/sh" > .jikes
+       echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
+       echo -n 'PATH=$$PATH:upstream/install/bin/ jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+       (type jikes && (jikes --version | grep "Version 1.18")) || make jikes-1.18/src jikes-1.18/.installed
        echo -n "$(jikes_flags) -bootclasspath " >> .jikes
        echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
        echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }"  >> GetBootClassPath.java
        javac GetBootClassPath.java
        java -cp . GetBootClassPath >> .jikes
        rm GetBootClassPath.*
+       echo 'EXIT=$$?' >> .jikes
+       echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
+       echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
+       echo 'exit $$EXIT' >> .jikes
+       chmod +x .jikes
 
 # make the package's directory (if it doesn't exist)
 $(packages):
@@ -50,7 +56,21 @@ $(packages):
 $(packages:%=%-$(target)): %-$(target): %
        make $</src $</build-$(target)/.installed target=$(patsubst $<-%,%,$@)
 
-gcc-3.3-mips: binutils-2.13.2.1-mips
+gcc-3.3-$(target): binutils-2.13.2.1-$(target)
+
+gcc-3.3-i686-pc-mingw32: .w32api .mingw-runtime
+
+.w32api:
+       @echo -e "\ndownloading w32api-2.3..."
+       @mkdir -p install/i686-pc-mingw32
+       @curl $(url_w32api-2.3) | tar xzf - -C install/i686-pc-mingw32
+       @touch .w32api
+
+.mingw-runtime:
+       @echo -e "\ndownloading mingw-runtime-3.0..."
+       @mkdir -p install/i686-pc-mingw32
+       @curl $(url_mingw-runtime-3.0) | tar xzf - -C install/i686-pc-mingw32
+       @touch .mingw-runtime
 
 # download the source code
 $(packages:%=%/src): %/src: