X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=24755028bfd9a010d14e504729910a77a7020bbf;hb=793964725ac9b1ad72ff8bfe0748678b9f81629b;hp=1a28091729fe78433ad8721ff79eaa55c335605b;hpb=003a127a2038438706bb7fac69a710c4b6b9ea36;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 1a28091..2475502 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -16,6 +16,7 @@ url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc
 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_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
@@ -61,8 +62,12 @@ endif
 .configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target)
 
 # how to configure it
-configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm
-configure_gcc-3.3                       += --disable-shared --disable-jvmpi
+configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
+ifneq ($(platform),Solaris)
+configure_gcc-3.3                       += --disable-shared 
+else
+configure_gcc-3.3                       += --enable-shared 
+endif
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
 ifneq ($(shell uname),$(platform))
 ifneq ($(target),mips-unknown-elf)
@@ -115,7 +120,7 @@ endif
 	mkdir -p upstream/$*
 	curl $(url_$*) | tar xzf - -C upstream/$*
 	mv upstream/$*/$* upstream/$*/src; true
-	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
+	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
 	touch $@
 
 .configure_%_$(target): .download_% 
@@ -134,7 +139,7 @@ endif
 	cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
 	touch $@
 
-.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target)
+.install_libmspack-20030726_$(target): .compile_libmspack-20030726_$(target)
 	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