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

diff --git a/upstream/Makefile b/upstream/Makefile
index babf385..bc22067 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -30,8 +30,10 @@ tasks/everything: \
 	tasks/build_linpack \
 
 
-darcs_gcclass = http://darcs.brianweb.net/gcclass
-darcs_classgen = http://darcs.brianweb.net/classgen
+darcs_gcclass = http://gcclass.ibex.org/
+darcs_classgen = http://classgen.ibex.org/
+git_gcclass = http://gcclass.ibex.org/.git/
+git_classgen = http://classgen.ibex.org/.git/
 cross_root := $(usr)/mips-unknown-elf
 .SECONDARY: # This is broken in gmake < 3.79.1
 
@@ -64,7 +66,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_%
@@ -100,6 +102,30 @@ tasks/build_darcs_%: tasks/extract_darcs_%
 	cd "build/$*" && $(MAKE)
 	touch $@
 
+tasks/extract_git_%:
+	if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
+	mkdir -p build
+	if [ -z "$(git_$*)" ]; then echo "No git url for $*" >&2; false; fi
+	if [ -d "$(root)/.git" ]; then \
+		cd build && git clone "$(git_$*)" "$*"; \
+	else \
+		mkdir -p "build/" && cd "build/"; \
+		git clone $(darcs_$*) $*; \
+	fi
+	touch $@
+
+update_git_%: tasks/extract_git_%
+	if [ -d "build/$*/.git" ]; then \
+		cd "build/$*" && git fetch; \
+	else \
+		cd "build/$*" && git clone $(git_$*); \
+	fi
+	rm -f "tasks/build_git_$*" # to force a rebuild
+
+tasks/build_git_%: tasks/extract_git_%
+	cd "build/$*" && $(MAKE)
+	touch $@
+
 clean_%:
 	rm -rf "build/$(*)"*
 	rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*"
@@ -132,7 +158,7 @@ url_gcc-core = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-core-$(v
 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
+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"
@@ -211,7 +237,7 @@ tasks/build_newlib: tasks/build_gcc
 
 ## openbsdglob ##############################################################################
 
-url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
+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}
@@ -228,7 +254,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}
@@ -377,7 +403,7 @@ tasks/build_freetype: tasks/patch_freetype tasks/build_libc
 
 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://www.brianweb.net/misc/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