X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=20c53458db2011754959353e43151c08740e87a1;hp=16f92f6e8705c4c4d34c5a7e933f67ec5eb9c802;hb=841116dc9ea77cbd7b948e857595736554b80e53;hpb=336c419b8a480179bfc36868cd065c7ef014abd4

diff --git a/upstream/Makefile b/upstream/Makefile
index 16f92f6..20c5345 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -1,12 +1,42 @@
 # Inspired by XWT's Makefile.upstream
 
-version_gcc = 3.3.3
-
-url_gcc-core = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz
-url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
-url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
-
-patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch
+sourceforge = http://softlayer.dl.sourceforge.net/sourceforge/
+
+tasks/everything: \
+	tasks/build_newlib \
+	tasks/build_gcc \
+	tasks/build_binutils \
+	tasks/build_newlib \
+	tasks/build_regex \
+	tasks/build_openbsdglob \
+	tasks/build_zlib \
+	tasks/build_expat \
+	tasks/build_gmp \
+	tasks/build_expat \
+	tasks/build_linker \
+	tasks/build_libc \
+	tasks/build_libjpeg \
+	tasks/build_libmspack \
+	tasks/build_freetype \
+	tasks/build_boehmgc \
+	tasks/build_busybox \
+	tasks/build_texinputs \
+	tasks/build_samba \
+	tasks/build_nasm \
+	tasks/build_tex \
+	tasks/build_tex_tangle \
+	tasks/build_tex_weave \
+	tasks/build_linpack \
+	tasks/build_gpc \
+
+
+version_gcc = 3.3.6
+
+url_gcc-core = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz
+url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
+url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
+
+patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch gcc-3.3.6-fortran.patch
 
 configure_gcc = --target=mips-unknown-elf --disable-threads --with-gnu-ld --with-gnu-as --with-newlib=yes --enable-sjlj-exceptions --enable-languages="c"
 configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++,f77"
@@ -23,7 +53,7 @@ configure_binutils = --target=mips-unknown-elf
 
 version_newlib = 1.11.0
 url_newlib = ftp://sources.redhat.com/pub/newlib/newlib-$(version_newlib).tar.gz
-patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch
+patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch newlib-unistd.patch newlib-nestedvm-define.patch
 configure_newlib = --enable-multilib --target=mips-unknown-elf
 
 url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
@@ -31,10 +61,21 @@ url_regex = http://arglist.com/regex/regex3.8a.tar.gz
 
 url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
 
+version_zlib = 1.2.3
+url_zlib = http://www.zlib.net/zlib-$(version_zlib).tar.gz
+
+version_expat = 2.0.0
+url_expat = $(sourceforge)expat/expat-$(version_expat).tar.gz
+configure_expat = --host= --target=mips-unknown-elf
+
 version_gmp = 4.1.4
 url_gmp = ftp://ftp.gnu.org/gnu/gmp/gmp-$(version_gmp).tar.gz
 configure_gmp = --host=mips-unknown-elf
 
+version_nasm = 0.98.39
+url_nasm = $(sourceforge)nasm/nasm-$(version_nasm).tar.gz
+configure_nasm = --host=mips-unknown-elf
+
 darcs_gcclass = http://darcs.brianweb.net/gcclass
 darcs_classgen = http://darcs.brianweb.net/classgen
 
@@ -156,6 +197,14 @@ tasks/build_%: tasks/patch_%
 		$(MAKE) install
 	touch $@
 
+tasks/build_zlib: tasks/patch_zlib
+	mkdir -p $(usr)
+	cd build/zlib-$(version_zlib) && \
+		AR="mips-unknown-elf-ar rc" CC=mips-unknown-elf-gcc ./configure --prefix=$(usr) $(configure_$*) && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
+		$(MAKE) install
+	touch $@
+
 tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	mkdir -p $(usr)
 	mkdir -p build/gcc-obj && cd build/gcc-obj && \
@@ -220,7 +269,7 @@ tasks/build_gmp: tasks/patch_gmp tasks/build_libc
 		make && \
 		make install exec_prefix=$(usr)/mips-unknown-elf includedir=$(usr)/mips-unknown-elf/include
 	touch $@
-	
+
 #
 # Tests
 # These are simply here for convenience. They aren't required 
@@ -235,7 +284,7 @@ url_libmspack = http://www.kyz.uklinux.net/downloads/libmspack-$(version_libmspa
 patches_libmspack = libmspack.patch
 
 version_freetype = 2.1.4
-url_freetype = http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-$(version_freetype).tar.gz
+url_freetype = $(sourceforge)freetype/freetype-$(version_freetype).tar.gz
 patches_freetype = freetype.patch ft-nostdio.patch
 
 version_boehmgc = 6.3alpha2