questionable patch: merge of a lot of stuff from the svg branch

[org.ibex.core.git] / Makefile.upstream

diff --git a/Makefile.upstream b/Makefile.upstream
index f7867d9..4b2c6bf 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -17,7 +17,7 @@ url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-2003072
 url_vera-1.10          := http://fgo-temp.acc.umu.se/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz
 url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz
 url_bcel-5.1           := http://www.apache.org/dist/jakarta/bcel/binaries/bcel-5.1.tar.gz
-url_gnu.regexp-1.1.4   := ftp://ftp.tralfamadore.com/pub/java/gnu.regexp-1.1.4.tar.gz
+url_gnu.regexp-1.1.4   := http://21cma.bao.ac.cn/gentoo/distfiles/gnu.regexp-1.1.4.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
        rm -rf upstream/darwin-linker/src
@@ -107,21 +107,24 @@ environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bi
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
-.download_nestedvm:
-       mkdir -p upstream/nestedvm
-       cd upstream/nestedvm; wget -l 99 -nH -r http://nestedvm.ibex.org/
+.download_org.ibex.nestedvm:
+       @mkdir -p upstream; cd upstream; rm -rf org.ibex.$*; rm -rf org.ibex.$*_*
+       @cd upstream; git clone http://nestedvm.ibex.org/.git org.ibex.nestedvm
+       @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
+       @rm -f src/org/ibex/$*
+       @ln -s ../../../upstream/org.ibex.$*/src/org/ibex/$* src/org/ibex/$*
+       @touch $@
+
+.build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm
+       cd upstream/org.ibex.nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
        touch $@
 
-.build_nestedvm: .vendor .download_nestedvm
-       cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
-       touch $@
-
-.install_nestedvm: .build_nestedvm
-       touch $@
-
-.download_org.ibex.crypto:
-       mkdir -p upstream/org.ibex.crypto
-       cd upstream/org.ibex.crypto; wget -l 99 -nH -r http://crypto.ibex.org/
+.install_org.ibex.nestedvm: .build_org.ibex.nestedvm
        touch $@
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
@@ -144,7 +147,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 $@
 
@@ -186,7 +189,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 \
@@ -206,7 +209,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)