2003/09/04 08:28:18

darcs-hash:20040130070444-2ba56-a81465804ec84440f092bb181d9ba0274a5bc7eb.gz

diff --git a/upstream/Makefile b/upstream/Makefile
index 46e1101..9bc68d6 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -4,27 +4,27 @@
 #
 
 # upstream packages we need
-packages               := jikes-1.18 binutils-2.13.2.1 newlib-1.11.0 w32api-2.3 mingw-runtime-3.0 freetype-2.1.4 gcc-3.3 jpeg-6b
+packages               := jikes-1.18 binutils-2.13.2.1 newlib-1.11.0 w32api-2.3 mingw-runtime-3.0 freetype-2.1.4 gcc-3.3.1 jpeg-6b
 
 # 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_gcc-3.3.1            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3.1/gcc-3.3.1.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
 
 # 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-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
-configure_gcc-3.3-sparc-sun-solaris2.7  := --enable-threads=posix --disable-multilib
-configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads
+configure_gcc-3.3.1                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
+configure_gcc-3.3.1                       += --disable-java-awt --disable-interpreter --enable-static
+configure_gcc-3.3.1                       += --with-gnu-ld --with-gnu-as
+configure_gcc-3.3.1-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization
+configure_gcc-3.3.1-i686-pc-mingw32       := --enable-threads=win32 --enable-hash-synchronization
+configure_gcc-3.3.1-i686-pc-linux-gnu     := --enable-threads=posix --enable-hash-synchronization
+configure_gcc-3.3.1-sparc-sun-solaris2.7  := --enable-threads=posix --disable-multilib
+configure_gcc-3.3.1-mips                  := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
 .jikes:
@@ -56,7 +56,21 @@ $(packages):
 $(packages:%=%-$(target)): %-$(target): %
        make $</src $</build-$(target)/.installed target=$(patsubst $<-%,%,$@)
 
-gcc-3.3-$(target): binutils-2.13.2.1-$(target)
+gcc-3.3.1-$(target): binutils-2.13.2.1-$(target)
+
+gcc-3.3.1-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: