X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=43f14a7fb0e9f1b1f95d5538259f953b1cf4d722;hp=9d233e08cb52ba2fb9aec78a478e3a0160a65347;hb=d5566fee6b4ea8e85ddea33ce20587e7c523bc25;hpb=2e1a4dfab3d3a476849d4b01a77f95400718cfa9

diff --git a/upstream/Makefile b/upstream/Makefile
index 9d233e0..43f14a7 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -1,32 +1,38 @@
 # Inspired by XWT's Makefile.upstream
 
-version_gcc = 3.3
-version_gpc = 20030830
-version_texinputs = 1.0
-url_gcc-core = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz
-url_gcc-c++ = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
-patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.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++"
-
-version_binutils = 2.14
-url_binutils = ftp://ftp.gnu.org/gnu/binutils/binutils-$(version_binutils).tar.gz
-patches_binutils = binutils-no64.patch binutils-nocompilein.patch
-configure_binutils = --target=mips-unknown-elf
-
-version_newlib = 1.11.0
-url_newlib = http://mirrors.rcn.net/pub/sourceware/newlib/newlib-$(version_newlib).tar.gz
-patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-vasprintf.patch newlib-nomemcpy.patch
-configure_newlib = --enable-multilib --target=mips-unknown-elf
-
-url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
-url_regex = ftp://ftp.zoo.toronto.edu/pub/regex.shar
-
-version_bcel = 5.1
-url_bcel = http://mirrors.mix5.com/apache/jakarta/bcel/binaries/bcel-$(version_bcel).tar.gz
-
-url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
-
+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_samba \
+	tasks/build_nasm \
+	tasks/build_gpc \
+	tasks/build_tex \
+	tasks/build_tex_tangle \
+	tasks/build_tex_weave \
+	tasks/build_texinputs \
+	tasks/build_busybox \
+	tasks/build_linpack \
+
+
+darcs_gcclass = http://gcclass.ibex.org/
+darcs_classgen = http://classgen.ibex.org/
+cross_root := $(usr)/mips-unknown-elf
 .SECONDARY: # This is broken in gmake < 3.79.1
 
 upstream = $(shell pwd)
@@ -38,123 +44,71 @@ export PATH
 
 # Solaris' patch doesn't work, use gnu patch on solaris
 PATCH = $(shell test `uname` = SunOS && echo gpatch || echo patch)
+TAR = $(shell test `uname` = SunOS && echo gtar || echo tar)
 
-tasks/full_toolchain: tasks/build_binutils tasks/build_gcc_step2 tasks/build_libc
-	for f in crt0.o support.o support_aux.o; do \
-		rm -f "$(usr)/mips-unknown-elf/lib/$$f"; \
-		ln -s "$(root)/build/org/ibex/nestedvm/$$f" "$(usr)/mips-unknown-elf/lib/$$f"; \
-	done
-
-	rm -f "$(usr)/mips-unknown-elf/lib/linker.ld"
-	ln -s "$(root)/src/org/ibex/nestedvm/linker.ld" "$(usr)/mips-unknown-elf/lib/linker.ld"
-
-	if [ ! -e "$(usr)/mips-unknown-elf/include/getopt.h" ]; then \
-		echo '#include <unistd.h>' > "$(usr)/mips-unknown-elf/include/getopt.h"; \
-	fi
-	
-	mips-unknown-elf-gcc -dumpspecs \
-		| sed '/startfile:$$/{n;s/crt0%O%s/crt0%O%s support%O%s support_aux%O%s/;};' \
-		| sed '/link_command:$$/{n;s/%{T\*}/%{T*} %{!T:-T linker.ld%s}/;};' \
-		> "$(usr)/lib/gcc-lib/mips-unknown-elf/$(version_gcc)/specs"
-		
-	touch $@
-
-tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob
-	# HACK: Get the top level makefile to build the support stuff
-	make -s -C $(root) build/org/ibex/nestedvm/{crt0.o,support.o,support_aux.o}
+# Add extra nestedvm specific headers to include
+tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib
 
-	# Add our support stuff to libc
-	mips-unknown-elf-ar sr $(libc_a)  $(root)/build/org/ibex/nestedvm/{support.o,support_aux.o}
-	rm -f $(cross_root)/lib/crt0.o
-	cp $(root)/build/org/ibex/nestedvm/crt0.o $(cross_root)/lib/crt0.o
-
-	touch $@
-
-tasks/build_linker: tasks/build_binutils $(root)/src/org/ibex/nestedvm/linker.ld
-	cp $(root)/src/org/ibex/nestedvm/linker.ld $(cross_root)/lib/ldscripts/nestedvm.ld
-	for f in $(cross_root)/lib/ldscripts/elf32ebmip.*; do \
-		rm -f "$$f"; \
-		ln -s nestedvm.ld "$$f"; \
-	done
+	cd $(cross_root)/include && sh $<
 	touch $@
 
-clean_%:
-	rm -rf "build/$(*)"*
-	rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*"
-
-
-gpc := $(usr)/bin/mips-unknown-elf-gpc
-gpc_flags := --big-endian -w -lgpc -lc $(usr)/mips-unknown-elf/lib/support*.o
-gpc_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld
-g77 := $(usr)/bin/mips-unknown-elf-g77
-g77_flags := --big-endian -w -lg2c -lc $(usr)/mips-unknown-elf/lib/support*.o
-g77_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld
-
-# FIXME ugly path hacks evil bad
-nestedvm := java -cp $(usr)/../build/bcel/bcel-5.1.jar:$(usr)/../../build org.ibex.nestedvm.Compiler -outformat class
+top_lev_stuff := $(patsubst %,../build/org/ibex/nestedvm/%.o, crt0 support support_aux)
 
-tasks/download_tex:  ; mkdir -p build/tex; touch $@
-build/tex/tex.web:   ; curl -o $@ http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web
-build/dtex/tangle.p: ; curl http://www.gnu-pascal.de/crystal/gpc/en/attachments/5593/tangle.p.gz | zcat > $@
-tasks/extract_tex:     build/tex/tex.web build/tex/tangle.p; touch $@
+# HACK: Get the top level makefile to build the support stuff
+$(top_lev_stuff):
+	$(MAKE) -C .. $(top_lev_stuff:../%=%)
 
-build/tex/tangle.mips:  build/tex/tangle.p tasks/full_toolchain tasks/extract_tex tasks/build_gcc_step2
-	cd build/tex; $(gpc) tangle.p $(gpc_flags) -o tangle.mips
-build/tex/Tangle.class: build/tex/tangle.mips
-	$(nestedvm) -o unixruntime -outfile $@ Tangle $<
-build/tex/tex.p: build/tex/tex.web build/tex/tex.ch build/tex/Tangle.class
-	rm -f build/tex/tex.p build/tex/tex.pool
-	cd build/tex; java -cp .:$(usr)/../../build Tangle        \
-			--gpc-rts=-nPascalfile:tex.p              \
-			--gpc-rts=-npool:tex.pool                 \
-			--gpc-rts=-nwebfile:tex.web               \
-			--gpc-rts=-nchangefile:tex.ch
-build/tex/tex.mips:  build/tex/tex.p tasks/full_toolchain tasks/build_gcc_step2
-	cd build/tex; $(gpc) tex.p $(gpc_flags) -o tex.mips
-tasks/build_tex: build/tex/tex.mips
-	cd build/tex; $(nestedvm) -o unixruntime -outfile TeX.class TeX tex.mips
-	touch $@ 
-tasks/extract_texinputs: tasks/build_tex tasks/download_texinputs
-	cd build/tex; tar xvzf ../../download/texinputs-1.0.tgz
-	touch $@
-tasks/extract_linpack: tasks/download_linpack ; touch $@
-tasks/download_linpack:
-	mkdir -p build/linpack
-	cd build/linpack; wget -N http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
-	touch $@
-
-tasks/build_linpack: tasks/full_toolchain tasks/extract_linpack
-	cd build/linpack; $(g77) linpack_bench.f $(g77_flags) -o linpack.mips
-	cd build/linpack; $(nestedvm) -o unixruntime -outfile Linpack.class Linpack linpack.mips
-	touch $@
+##############################################################################
+# generic build targets ######################################################
 
 tasks/download_%:
 	if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
 	mkdir -p download
-	cd download && wget --passive-ftp -N $(url_$*)
-	touch $@
-
-tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++
+	cd download && curl -LO $(url_$*)
 	touch $@
 
 tasks/extract_%: tasks/download_%
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	mkdir -p build
 	cd build && \
-		gzip -dc  ../download/$*-$(version_$*).tar.gz | tar xf - && \
+		gzip -dc  ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \
 		rm -f $* && \
 		ln -s $*-$(version_$*) $*
 	touch $@
 
-tasks/extract_gcc: tasks/download_gcc
+tasks/extract_darcs_%:
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	mkdir -p build
-	cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | tar xf -
-	cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | tar xf -
+	if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
+	if [ -d "$(root)/_darcs" ]; then \
+		cd build && darcs get --repo-name="$*" --verbose "$(darcs_$*)"; \
+	else \
+		mkdir -p "build/" && cd "build/"; \
+		darcs get --repo-name=$* $(darcs_$*); \
+	fi
 	touch $@
 
+update_darcs_%: tasks/extract_darcs_%
+	if [ -d "build/$*/_darcs" ]; then \
+		cd "build/$*" && darcs pull; \
+	else \
+		cd "build/$*" && darcs get $(darcs_$*); \
+	fi
+	rm -f "tasks/build_darcs_$*" # to force a rebuild
+
+tasks/build_darcs_%: tasks/extract_darcs_%
+	cd "build/$*" && $(MAKE)
+	touch $@
+
+clean_%:
+	rm -rf "build/$(*)"*
+	rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*"
+
 tasks/patch_%: tasks/extract_%
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
 	cd build/$*-$(version_$*) &&  \
 	for p in $(patches_$*) end; do \
-		[ "$$p" = "end" ] || $(PATCH) -p0 < ../../patches/$$p || exit 1; \
+		[ "$$p" = "end" ] || $(PATCH) -p0 -l < ../../patches/$$p || exit 1; \
 	done
 	touch $@
 
@@ -166,34 +120,102 @@ tasks/build_%: tasks/patch_%
 		$(MAKE) install
 	touch $@
 
-tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
-	for f in crt0.o support.o support_aux.o; do \
-		rm -f "$(usr)/mips-unknown-elf/lib/$$f"; \
-		ln -s "$(root)/build/org/ibex/nestedvm/$$f" "$(usr)/mips-unknown-elf/lib/$$f"; \
-	done
+##############################################################################
+##############################################################################
 
-	rm -f "$(usr)/mips-unknown-elf/lib/linker.ld"
-	ln -s "$(root)/src/org/ibex/nestedvm/linker.ld" "$(usr)/mips-unknown-elf/lib/linker.ld"
 
-	if [ ! -e "$(usr)/mips-unknown-elf/include/getopt.h" ]; then \
-		echo '#include <unistd.h>' > "$(usr)/mips-unknown-elf/include/getopt.h"; \
-	fi
+## gcc ##############################################################################
+
+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-with-newer-version.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"
+
+tasks/build_gcc: tasks/build_linker
+
+tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
+	touch $@
 
-	mips-unknown-elf-gcc -dumpspecs \
-		| sed '/startfile:$$/{n;s/crt0%O%s/crt0%O%s support%O%s support_aux%O%s/;};' \
-		| sed '/link_command:$$/{n;s/%{T\*}/%{T*} %{!T:-T linker.ld%s}/;};' \
-		> "$(usr)/lib/gcc-lib/mips-unknown-elf/$(version_gcc)/specs"
+tasks/extract_gcc: tasks/download_gcc
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
+	mkdir -p build
+	cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf -
+	cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | $(TAR) -xf -
+	cd build && gzip -dc ../download/gcc-g77-$(version_gcc).tar.gz | $(TAR) -xf -
+	touch $@
 
+tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	mkdir -p $(usr)
 	mkdir -p build/gcc-obj && cd build/gcc-obj && \
 		echo | ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
-		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/bin/mips-unknown-elf-gcc && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
 		$(MAKE) install
 	touch $@
 
+
+## gpc ##############################################################################
+
+version_gpc = 20030830
+#url_gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz
+url_gpc = http://nestedvm.ibex.org/upstream/gpc-$(version_gpc).tar.gz
+patches_gpc = $(patches_gcc) gpc-with-3.3.3.patch gpc-noutils.patch
+configure_gpc = $(configure_gcc) --enable-languages="pascal"
+
+tasks/extract_gpc: tasks/download_gcc tasks/download_gpc
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
+	mkdir -p build/gpc.extract
+	cd build/gpc.extract && \
+		gzip -dc ../../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf - && \
+		gzip -dc ../../download/gpc-$(version_gpc).tar.gz      | $(TAR) -xf - && \
+		test ! -e gcc-$(version_gcc)/gcc/p && \
+		mv gpc-$(version_gpc)/p gcc-$(version_gcc)/gcc/p
+	mv build/gpc.extract/gcc-$(version_gcc) build/gpc-$(version_gpc)
+	rm -rf build/gpc.extract
+	touch $@
+
+tasks/build_gpc: tasks/patch_gpc tasks/build_libc
+	mkdir -p $(usr)
+	 # We need to preapply this patch because gpc's configury doesn't like 3.3.3
+	cd build/gpc-$(version_gpc) && cat gcc/version.c | grep -q GPC || $(PATCH) -p0 < gcc/p/diffs/gcc-3.3.diff
+
+	 # echo | is to dismiss the gcc version warning
+	mkdir -p build/gpc-obj && cd build/gpc-obj && \
+		echo | ../gpc-$(version_gpc)/configure --prefix=$(usr) $(configure_gpc) && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
+		cd gcc && $(MAKE) pascal.install
+
+	touch $@
+
+
+## binutils ##############################################################################
+
+version_binutils = 2.14
+url_binutils = ftp://ftp.gnu.org/gnu/binutils/binutils-$(version_binutils).tar.gz
+patches_binutils = binutils-no64.patch binutils-nocompilein.patch
+configure_binutils = --target=mips-unknown-elf
+
+## newlib ##############################################################################
+
+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 newlib-unistd.patch newlib-nestedvm-define.patch
+configure_newlib = --enable-multilib --target=mips-unknown-elf
+
+tasks/build_newlib: tasks/build_gcc
+
+## openbsdglob ##############################################################################
+
+url_openbsdglob = http://nestedvm.ibex.org/upstream/openbsdglob.tar.gz
+
 tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib
 	@mkdir -p $(usr)/mips-unknown-elf/{include,lib}
-	cd build && gzip -dc ../download/openbsdglob.tar.gz | tar xf -
+	cd build && gzip -dc ../download/openbsdglob.tar.gz | $(TAR) -xf -
 	cd build/openbsdglob && \
 		mips-unknown-elf-gcc '-Dissetugid()=0' -DARG_MAX=65536 $(MIPS_CFLAGS) -I. -c -o glob.o glob.c && \
 		mips-unknown-elf-gcc -O2 -Wall -Werror -I. -c -o fnmatch.o fnmatch.c && \
@@ -203,11 +225,16 @@ tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib
 		cp *.a $(usr)/mips-unknown-elf/lib
 	touch $@
 
+
+## regex ##############################################################################
+
+url_regex = http://www.arglist.com/regex/files/regex3.8a.tar.gz
+
 tasks/build_regex: tasks/download_regex tasks/build_newlib
 	@mkdir -p $(usr)/mips-unknown-elf/{include,lib}
 	mkdir -p build/regex build/regex/fake
-	cd build/regex && \
-		sh ../../download/regex.shar && \
+	cd build && \
+		tar xvzf ../download/regex3.8a.tar.gz && cd regex && \
 		make CC=mips-unknown-elf-gcc CFLAGS="-I. $(MIPS_CFLAGS)" regcomp.o regexec.o regerror.o regfree.o && \
 		mips-unknown-elf-ar cr libregex.a regcomp.o regexec.o regerror.o regfree.o && \
 		mips-unknown-elf-ranlib libregex.a && \
@@ -216,49 +243,90 @@ tasks/build_regex: tasks/download_regex tasks/build_newlib
 	touch $@
 
 
-#
-# Tests
-# These are simply here for convenience. They aren't required 
-# to build or run mips2java
-#
+## linpack ##############################################################################
 
-tasks/build_freetype: tasks/full_toolchain
-tasks/build_libjpeg: tasks/full_toolchain
-tasks/build_boehmgc: tasks/full_toolchain
-tasks/build_libmspack: tasks/full_toolchain
-tasks/build_freetype: tasks/full_toolchain
+url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
 
-version_libjpeg = 6b
-url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz
+## zlib ##############################################################################
 
-version_libmspack = 20030726
-url_libmspack = http://www.kyz.uklinux.net/downloads/libmspack-$(version_libmspack).tar.gz
-patches_libmspack = libmspack.patch
+version_zlib = 1.2.3
+url_zlib = http://www.zlib.net/zlib-$(version_zlib).tar.gz
 
-version_freetype = 2.1.4
-url_freetype = http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-$(version_freetype).tar.gz
-patches_freetype = freetype.patch ft-nostdio.patch
+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 $@
 
-version_boehmgc = 6.3alpha2
-url_boehmgc = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc$(version_boehmgc).tar.gz
-patches_boehmgc = boehm-gc.patch
 
-version_busybox = 1.00-pre9
-url_busybox = http://busybox.net/downloads/busybox-$(version_busybox).tar.gz
-patches_busybox = busybox.patch
+## expat ##############################################################################
+
+version_expat = 2.0.0
+url_expat = $(sourceforge)expat/expat-$(version_expat).tar.gz
+configure_expat = --host= --target=mips-unknown-elf
+
+## gmp ##############################################################################
+
+version_gmp = 4.1.4
+url_gmp = ftp://ftp.gnu.org/gnu/gmp/gmp-$(version_gmp).tar.gz
+configure_gmp = --host=mips-unknown-elf
+
+tasks/build_gmp: tasks/patch_gmp tasks/build_libc
+	cd build/gmp && \
+		CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \
+		./configure --prefix=$(usr) $(configure_gmp) && \
+		make && \
+		make install exec_prefix=$(usr)/mips-unknown-elf includedir=$(usr)/mips-unknown-elf/include
+	touch $@
+
+
+## nasm ##############################################################################
+
+version_nasm = 0.98.39
+url_nasm = $(sourceforge)nasm/nasm-$(version_nasm).tar.gz
+configure_nasm = --host=mips-unknown-elf
+
+
+# Add our support stuff to libc
+tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob misc/extraheaders.sh $(top_lev_stuff)
+	mips-unknown-elf-ar sr $(cross_root)/lib/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux)
+	mips-unknown-elf-ar sr $(cross_root)/lib/single-float/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux)
+	rm -f $(cross_root)/lib/crt0.o
+	cp $(root)/build/org/ibex/nestedvm/crt0.o $(cross_root)/lib/crt0.o
+
+	touch $@
+
+tasks/build_linker: tasks/build_binutils $(root)/src/org/ibex/nestedvm/linker.ld
+	cp $(root)/src/org/ibex/nestedvm/linker.ld $(cross_root)/lib/ldscripts/nestedvm.ld
+	for f in $(cross_root)/lib/ldscripts/elf32ebmip.*; do \
+		rm -f "$$f"; \
+		ln -s nestedvm.ld "$$f"; \
+	done
+	touch $@
+
+
+
+
+
+## libjpeg ##############################################################################
+
+version_libjpeg = 7
+url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz
 
 tasks/extract_libjpeg: tasks/download_libjpeg
 	mkdir -p build
 	cd build && \
-		gzip -dc ../download/jpegsrc.v$(version_libjpeg).tar.gz | tar xf - && \
+		gzip -dc ../download/jpegsrc.v$(version_libjpeg).tar.gz | $(TAR) -xf - && \
 		mv jpeg-$(version_libjpeg) libjpeg-$(version_libjpeg) && \
 		rm -f libjpeg && \
 		ln -s libjpeg-$(version_libjpeg)  libjpeg
 	touch $@    
 
-tasks/build_libjpeg: tasks/patch_libjpeg
+tasks/build_libjpeg: tasks/patch_libjpeg tasks/build_libc
 	cd build/libjpeg-$(version_libjpeg) && \
-		./configure && \
+		./configure --host=mips && \
 		make CC="mips-unknown-elf-gcc" \
 			AR="mips-unknown-elf-ar rc" \
 			AR2="mips-unknown-elf-ranlib" \
@@ -266,16 +334,22 @@ tasks/build_libjpeg: tasks/patch_libjpeg
 			LDFLAGS="$(MIPS_LDFLAGS)"
 	touch $@    
 
-tasks/extract_libmspack: tasks/download_libmspack
+## libmspack ##############################################################################
+
+version_libmspack = 20030726
+url_libmspack = http://www.cabextract.org.uk/libmspack/libmspack-$(version_libmspack).tar.gz
+patches_libmspack = libmspack.patch
+
+tasks/extract_libmspack: tasks/download_libmspack tasks/build_libc
 	mkdir -p build
 	cd build && \
-		gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | tar xf - && \
+		gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | $(TAR) -xf - && \
 		mv libmspack libmspack-$(version_libmspack) && \
 		rm -f libmspack && \
 		ln -s libmspack-$(version_libmspack)  libmspack
 	touch $@    
 
-tasks/build_libmspack: tasks/patch_libmspack tasks/full_toolchain
+tasks/build_libmspack: tasks/patch_libmspack tasks/build_libc
 	cd build/libmspack-$(version_libmspack)/mspack && \
 		make CC="mips-unknown-elf-gcc" \
 			AR="mips-unknown-elf-ar" \
@@ -283,7 +357,13 @@ tasks/build_libmspack: tasks/patch_libmspack tasks/full_toolchain
 			OPTIM="$(MIPS_CFLAGS)"
 	touch $@    
 
-tasks/build_freetype: tasks/patch_freetype tasks/full_toolchain
+## freetype ##############################################################################
+
+version_freetype = 2.1.4
+url_freetype = $(sourceforge)freetype/freetype-$(version_freetype).tar.gz
+patches_freetype = freetype.patch ft-nostdio.patch
+
+tasks/build_freetype: tasks/patch_freetype tasks/build_libc
 	cd build/freetype-$(version_freetype) && \
 		$(MAKE) setup ansi && \
 		$(MAKE) CC="mips-unknown-elf-gcc" \
@@ -293,17 +373,24 @@ tasks/build_freetype: tasks/patch_freetype tasks/full_toolchain
 		mips-unknown-elf-ranlib objs/libfreetype.a
 	touch $@    
 
+## boehm-gc ##############################################################################
+
+version_boehmgc = 6.3alpha2
+#url_boehmgc = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc$(version_boehmgc).tar.gz
+url_boehmgc = http://nestedvm.ibex.org/upstream/gc$(version_boehmgc).tar.gz
+patches_boehmgc = boehm-gc.patch
+
 tasks/extract_boehmgc: tasks/download_boehmgc
 	mkdir -p build
 	cd build && \
 		rm -rf gc$(version_boehmgc) && \
-		gzip -dc ../download/gc$(version_boehmgc).tar.gz | tar xf - && \
+		gzip -dc ../download/gc$(version_boehmgc).tar.gz | $(TAR) -xf - && \
 		rm -f boehmgc boehmgc-$(version_boehmgc) && \
 		ln -s gc$(version_boehmgc)  boehmgc && \
 		ln -s gc$(version_boehmgc)  boehmgc-$(version_boehmgc)
 	touch $@
 
-tasks/build_boehmgc: tasks/patch_boehmgc tasks/full_toolchain
+tasks/build_boehmgc: tasks/patch_boehmgc tasks/build_libc
 	cd build/gc$(version_boehmgc) && \
 		CC="mips-unknown-elf-gcc" CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \
 		./configure --host=mips-unknown-elf --disable-shared --disable-threads && \
@@ -311,14 +398,65 @@ tasks/build_boehmgc: tasks/patch_boehmgc tasks/full_toolchain
 		make gctest 
 	touch $@
 
-tasks/build_busybox: tasks/patch_busybox tasks/full_toolchain
+
+## busybox ##############################################################################
+
+version_busybox = 1.00-pre9
+url_busybox = http://www.busybox.net/downloads/legacy/busybox-$(version_busybox).tar.gz
+patches_busybox = busybox.patch
+
+tasks/build_busybox: tasks/patch_busybox tasks/build_libc
 	cd build && \
 		rm -f busybox && \
 		ln -s busybox-$(version_busybox) busybox
-	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g"
+	cd build/busybox && yes | $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g"
+	touch $@
+
+## tex ##############################################################################
+
+version_texinputs = 1.0
+url_texinputs = http://www.megacz.com/tmp/texinputs-$(version_texinputs).tgz
+
+tasks/extract_tex_tangle:
+	@mkdir -p build/tex
+	cd build/tex && curl -o tex.web http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web
+	touch $@
+
+tasks/build_tex_tangle: tasks/extract_tex_tangle tasks/build_gpc
+	@mkdir -p build/tex
+	mips-unknown-elf-gpc $(MIPS_PCFLAGS) build/tex/tangle.p $(MIPS_LDFLAGS) -o build/tex/tangle.mips
 	touch $@
 
-tasks/build_gcclass:
-	cd build &&  darcs get --verbose http://darcs.brianweb.net/gcclass
-	cd build/gcclass && make
+tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs
+	@mkdir -p build/tex
+
+	 # HACK: Build Tangel.class
+	make -C $(root) build/tests/Tangle.class
+
+	rm -f build/tex/tex.p build/tex/tex.pool
+	cp misc/tex.ch build/tex/tex.ch
+	cd build/tex && \
+		$(TAR) xfz ../../download/texinputs-$(version_texinputs).tgz && \
+		java -cp $(root)/build:$(upstream)/build/classgen/build tests.Tangle \
+			--gpc-rts=-nPascalfile:tex.p    \
+			--gpc-rts=-npool:tex.pool       \
+			--gpc-rts=-nwebfile:tex.web     \
+			--gpc-rts=-nchangefile:tex.ch   \
+			&& \
+		mips-unknown-elf-gpc $(MIPS_PCFLAGS) tex.p $(MIPS_LDFLAGS) -o tex.mips
+	touch $@
+
+## samba ##############################################################################
+
+version_samba = 3.0.4
+url_samba = http://us1.samba.org/samba/ftp/old-versions/samba-$(version_samba).tar.gz
+patches_samba = samba.patch
+
+tasks/build_samba: tasks/patch_samba
+	cd build/samba-$(version_samba)/source && \
+		test -e config.status || ./configure --host=mips-unknown-elf && \
+		fgrep -q '#define HAVE_GETTIMEOFDAY_TZ' include/config.h || \
+			echo '#define HAVE_GETTIMEOFDAY_TZ 1' >> include/config.h && \
+		make LIBS="-lglob" CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \
+		     CONFIGFILE="smb.conf" proto_exists bin/ntlm_auth
 	touch $@