Upgrade libjpeg to version 7.

[nestedvm.git] / upstream / Makefile

diff --git a/upstream/Makefile b/upstream/Makefile
index 6fa279d..babf385 100644 (file)
--- 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/$*"; \
-               wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+               mkdir -p "build/" && cd "build/"; \
+               darcs get --repo-name=$* $(darcs_$*); \
        fi
        touch $@
 
@@ -92,7 +92,7 @@ update_darcs_%: tasks/extract_darcs_%
        if [ -d "build/$*/_darcs" ]; then \
                cd "build/$*" && darcs pull; \
        else \
-               cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \
+               cd "build/$*" && darcs get $(darcs_$*); \
        fi
        rm -f "tasks/build_darcs_$*" # to force a rebuild
 
@@ -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 ##############################################################################