X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=2224f5d9a880140ac8627cefdea6bf96b10f4817;hb=f4ff7c16a3b69784da7f66f6ff1be899b4a5f508;hp=db967308f4f93ae3582d81e772f814a12a762f78;hpb=7431226f404a5517a4b68548284872336b0e5249;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index db96730..2224f5d 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -15,6 +15,7 @@ url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/fre
 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_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
 	rm -rf upstream/darwin-linker/src
@@ -22,7 +23,7 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
 ifneq ($(shell uname),Darwin)
 	cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done
 	cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff
-	cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; ../../links.sh
+	cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; chmod +x ../../links.sh; ../../links.sh
 endif
 	make -C upstream/darwin-linker/src/cctools/libstuff
 	make -C upstream/darwin-linker/src/cctools/misc
@@ -40,7 +41,9 @@ endif
 	cp upstream/darwin-linker/src/cctools/misc/libtool.NEW upstream/install/powerpc-apple-darwin/bin/apple-libtool
 	cp upstream/darwin-linker/src/cctools/misc/strip.NEW upstream/install/powerpc-apple-darwin/bin/strip
 	cp upstream/darwin-linker/src/cctools/as/appc_dir/as upstream/install/powerpc-apple-darwin/bin/as
-	cp upstream/darwin-linker/src/cctools/ar/ar.NEW upstream/install/powerpc-apple-darwin/bin/ar
+	cp upstream/darwin-linker/src/cctools/ar/ar.NEW upstream/install/powerpc-apple-darwin/bin/ar.NEW
+	echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ar.NEW \$$@\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ranlib \$$2\n" > upstream/install/powerpc-apple-darwin/bin/ar
+	chmod +x upstream/install/powerpc-apple-darwin/bin/ar
 	mkdir -p upstream/install/bin
 	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ld powerpc-apple-darwin-ld
 	cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/as powerpc-apple-darwin-as
@@ -52,7 +55,7 @@ endif
 	touch $@
 
 # building gcc requires binutils
-.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
+.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)      
 
 # building newlib requires gcc
 .configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target)
@@ -64,10 +67,9 @@ configure_gcc-3.3                       += --disable-java-awt --disable-interpre
 ifneq ($(shell uname),$(platform))
 configure_gcc-3.3                       += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
 configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
-configure_gcc-3.3_powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+configure_gcc-3.3                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 endif
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
-configure_gcc-3.3_i686-pc-mingw32       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-synchronization
 configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
 configure_gcc-3.3_sparc-sun-solaris2.7  += --enable-threads=posix --disable-multilib
@@ -81,6 +83,12 @@ environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/
 environment_jpeg-6b_$(target)           += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
 environment_jpeg-6b_$(target)           += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
 
+# libmspack configury doesn't obey --target
+environment_libmspack-20030726_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
+environment_libmspack-20030726_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
+environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar"
+environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+
 environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bin:$$PATH
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
@@ -94,6 +102,10 @@ vendor: .vendor; @true
 	mkdir -p upstream/install/i686-pc-mingw32
 	curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
 	curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
+ifeq ($(shell uname),Linux)
+	rm -rf upstream/install/i686-pc-linux-gnu/include
+	ln -sf /usr/include upstream/install/i686-pc-linux-gnu/include
+endif
 	touch .vendor
 
 .download_%:
@@ -115,17 +127,28 @@ vendor: .vendor; @true
 		$(configure_$*_$(target))
 	touch $@
 
+.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)
+	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
 	cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../../install/bin make CC=mips-unknown-elf-gcc AR=mips-unknown-elf-ar
 	upstream/install/bin/mips-unknown-elf-ranlib upstream/freetype-2.1.4/src/objs/libfreetype.a
 	touch $@
 
-.install_%_$(target): .configure_%_$(target)
+.build_%_$(target): .configure_%_$(target)
 	@echo -e "\n\033[1mbuilding $*...\033[0m"
 	cd upstream/$*/build-$(target); \
 		$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
 		$(environment_$*_$(target)) \
 		make $(setcc) $(environment_$*_$(target))
+	touch $@
+
+.install_%_$(target): .build_%_$(target)
 	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); \
 		$(setcc) PATH=$$PATH:`pwd`/../../install/bin \