X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=a281337a636f7cb43b43b32ef0c468c91ea5595d;hb=3afd663660a818f0029e3081442a7d76793b6dc6;hp=ca7edf64a14982d023104287d605f38578b625a8;hpb=466511543a8a6c421bfa7979e000a115e1f2a2c8;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index ca7edf6..a281337 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -14,8 +14,9 @@ url_mingw-runtime-3.0  := http://umn.dl.sourceforge.net/sourceforge/mingw/mingw-
 url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz
 url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
-url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
+url_jikes-1.18         := http://dist.xwt.org/jikes-1.18.tgz
 url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz
+url_vera-1.10          := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
 	rm -rf upstream/darwin-linker/src
@@ -119,6 +120,7 @@ endif
 	mkdir -p upstream/$*
 	curl $(url_$*) | tar xzf - -C upstream/$*
 	mv upstream/$*/$* upstream/$*/src; true
+	mv upstream/$*/libmspack upstream/$*/src; true
 	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
 	touch $@
 
@@ -135,10 +137,7 @@ endif
 
 .configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
 	mkdir -p upstream/libmspack-20030726/build-$(target)
-	cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
-	touch $@
-
-.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target)
+	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
@@ -154,6 +153,8 @@ endif
 		make $(setcc) $(environment_$*_$(target))
 	touch $@
 
+.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
+
 .install_%_$(target): .build_%_$(target)
 	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); \
@@ -166,7 +167,7 @@ endif
 .jikes:
 	@echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
 	echo "#!/bin/sh" > .jikes
-	echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
+	#echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
 	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
 	(type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target=
 	echo -n "$(jikes_flags) -bootclasspath " >> .jikes
@@ -176,8 +177,8 @@ endif
 	java -cp . GetBootClassPath >> .jikes
 	rm GetBootClassPath.*
 	echo 'EXIT=$$?' >> .jikes
-	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
-	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
+	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
+	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
 	echo 'exit $$EXIT' >> .jikes
 	mv .jikes .jikes+
 	cp .jikes+ .jikes