X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=3659aa69467e4b958e595d99fb542cde305ddfdf;hp=5360084f0b81bcbc3705205d1518e01792c6c715;hb=119cb20e2b9d594032653c8464717b1420b6abc7;hpb=efbc1822d80a8fb04447731bb33d64d3537f8121

diff --git a/upstream/Makefile b/upstream/Makefile
index 5360084..3659aa6 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -14,7 +14,7 @@ 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
+patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-vasprintf.patch
 configure_newlib = --enable-multilib --target=mips-unknown-elf
 
 url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
@@ -97,7 +97,6 @@ tasks/patch_%: tasks/extract_%
 
 tasks/build_%: tasks/patch_%
 	mkdir -p $(usr)
-	@[ "$*" = "newlib" ] && rm -f $(usr)/mips-unknown-elf/lib/crt0.o || true
 	mkdir -p build/$*-obj && cd build/$*-obj && \
 		../$*-$(version_$*)/configure --prefix=$(usr) $(configure_$*) && \
 		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
@@ -164,7 +163,7 @@ 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 = 0.60.5
+version_busybox = 1.00-pre9
 url_busybox = http://busybox.net/downloads/busybox-$(version_busybox).tar.gz
 patches_busybox = busybox.patch
 
@@ -237,5 +236,5 @@ tasks/build_busybox: tasks/patch_busybox tasks/full_toolchain
 	cd build && \
 		rm -f busybox && \
 		ln -s busybox-$(version_busybox) busybox
-	cd build/busybox && $(MAKE) SHELL=/bin/bash LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -g"
+	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g"
 	touch $@