X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=07498137f6329c8520e6d73642a91fb273e6a774;hp=1bfa9d6ef3197a02fa538db67e5dea90e25e5e52;hb=f45bf5b8d4f76e5c847b8496a2ee7ef96c665077;hpb=b3193eb9454ece679467cce509aad071f1916577

diff --git a/Makefile.upstream b/Makefile.upstream
index 1bfa9d6..0749813 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -107,11 +107,11 @@ environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bi
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
-.download_org.ibex.nestedvm:
-	mkdir -p upstream/org.ibex.nestedvm
-	cd upstream/org.ibex.nestedvm; wget -l 999 -nH -r http://nestedvm.ibex.org/
-	find upstream/org.ibex.nestedvm -name index.html -exec rm -f {} \;
-	touch $@
+.download_org.ibex.%:
+	@echo -e "\033[1mfetching repository                 org.ibex.$*\033[0m"
+	@mkdir -p upstream; cd upstream; rm -rf org.ibex.$*; rm -rf org.ibex.$*_*
+	@cd upstream; darcs get --verbose --partial --repo-name=org.ibex.$* http://$*.ibex.org
+	@touch $@
 
 .build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm
 	cd upstream/org.ibex.nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
@@ -120,12 +120,6 @@ environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bi
 .install_org.ibex.nestedvm: .build_org.ibex.nestedvm
 	touch $@
 
-.download_org.ibex.crypto:
-	mkdir -p upstream/org.ibex.crypto
-	cd upstream/org.ibex.crypto; wget -l 999 -nH -r http://crypto.ibex.org/
-	find upstream/org.ibex.crypto -name index.html -exec rm -f {} \;
-	touch $@
-
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
 vendor: .vendor; @true
 .vendor:
@@ -146,7 +140,7 @@ endif
 	curl $(url_gcc-3.3) | tar xzf - -C upstream/gcc-3.3
 	mv upstream/gcc-3.3/gcc-3.3 upstream/gcc-3.3/src-darwin; true
 	mv upstream/gcc-3.3/libmspack upstream/gcc-3.3/src-darwin; true
-	(cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
+	(cd upstream/gcc-3.3/src-darwin && for A in ../patches/[a-y]*.patch; do patch -p0 -l < $$A; done); true
 	(cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
 	touch $@
 
@@ -188,7 +182,7 @@ endif
 	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
-.install_freetype-2.1.4_mips-unknown-elf: .install_nestedvm .download_freetype-2.1.4
+.install_freetype-2.1.4_mips-unknown-elf: .install_org.ibex.nestedvm .download_freetype-2.1.4
 	cd upstream/freetype-2.1.4/src; \
 	   make setup ansi; \
 	   PATH=$$PATH:`pwd`/../../install/bin make \
@@ -208,7 +202,7 @@ endif
 
 .install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
 
-.install_gcc-3.3_mips-unknown-elf: .install_nestedvm
+.install_gcc-3.3_mips-unknown-elf: .install_org.ibex.nestedvm
 	touch $@
 
 .install_%_$(target): .build_%_$(target)