X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=babf3854ac318f281a6787fbf56609c226b21145;hp=3549e76bb2b1686032a7d021895b0e14d8b1e4c3;hb=a36a2d5426615915e2179c160ab8fdda2a645ab5;hpb=b2f817856d994945778f8550a238471f72337445

diff --git a/upstream/Makefile b/upstream/Makefile
index 3549e76..babf385 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -83,8 +83,8 @@ tasks/extract_darcs_%:
 	if [ -d "$(root)/_darcs" ]; then \
 		cd build && darcs get --repo-name="$*" --verbose "$(darcs_$*)"; \
 	else \
-		mkdir -p "build/$*" && cd "build/$*"; \
-		darcs get $(darcs_$*); \
+		mkdir -p "build/" && cd "build/"; \
+		darcs get --repo-name=$* $(darcs_$*); \
 	fi
 	touch $@
 
@@ -312,7 +312,7 @@ tasks/build_linker: tasks/build_binutils $(root)/src/org/ibex/nestedvm/linker.ld
 
 ## libjpeg ##############################################################################
 
-version_libjpeg = 6b
+version_libjpeg = 7
 url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz
 
 tasks/extract_libjpeg: tasks/download_libjpeg
@@ -326,7 +326,7 @@ tasks/extract_libjpeg: tasks/download_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" \
@@ -401,15 +401,15 @@ tasks/build_boehmgc: tasks/patch_boehmgc tasks/build_libc
 
 ## busybox ##############################################################################
 
-version_busybox = 1.00
-url_busybox = http://busybox.net/downloads/busybox-$(version_busybox).tar.gz
+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) CC=mips-unknown-elf-gcc 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 ##############################################################################