update url for regex3.8a

[nestedvm.git] / upstream / Makefile

diff --git a/upstream/Makefile b/upstream/Makefile
index 9a5c210..ec0d9a4 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -64,7 +64,7 @@ $(top_lev_stuff):
 tasks/download_%:
        if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
        mkdir -p download
-       cd download && curl -O $(url_$*)
+       cd download && curl -LO $(url_$*)
        touch $@
 
 tasks/extract_%: tasks/download_%
@@ -228,7 +228,7 @@ tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib
 
 ## regex ##############################################################################
 
-url_regex = http://arglist.com/regex/regex3.8a.tar.gz
+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}
@@ -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" \