X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=86ebb67c92aa8187a146f046e5490e9e4af33e5b;hb=39b8b717736ea31aa80aac9b976dd6dd34b8950e;hp=46f6c5d7318c19f80d802eb41de6b338220df6a2;hpb=60fefa9ae5acd22f8eeb95a6f6a59c700af155b6;p=org.ibex.core.git

diff --git a/Makefile.upstream b/Makefile.upstream
index 46f6c5d..86ebb67 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -16,8 +16,20 @@ 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
 
+.install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
+	cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz
+	cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done
+	cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; ../../links.sh
+	make -C upstream/darwin-linker/src/cctools/libstuff
+	make -C upstream/darwin-linker/src/cctools/misc
+	make -C upstream/darwin-linker/src/cctools/ld; true
+	cp upstream/darwin-linker/src/cctools/ld/ld_dir/ld.NEW \
+		upstream/install/bin/powerpc-apple-darwin-ld
+	cp upstream/darwin-linker/src/cctools/misc/strip.NEW
+		upstream/install/bin/powerpc-apple-darwin-strip
+
 # building gcc requires binutils
-configure_gcc-3.3: binutils-2.13.2.1 .configure_gcc-3.3
+.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)
 
 # how to configure it
 configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
@@ -29,54 +41,58 @@ configure_gcc-3.3-i686-pc-linux-gnu     := --enable-threads=posix --enable-hash-
 configure_gcc-3.3-sparc-sun-solaris2.7  := --enable-threads=posix --disable-multilib
 configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads
 
+.PRECIOUS: .vendor .download_%_$(target) .configure_%_$(target) .install_%_$(target)
+
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
-vendor: .vendor
+vendor: .vendor; @true
 .vendor:
+	@echo -e "\n\033[1mdownloading vendor-supplied headers and libraries...\033[0m"
+	mkdir -p upstream/install
 	curl http://www.megacz.com/vendor.tgz | tar xzf - -C upstream/install
+	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
 	touch .vendor
 
-download_%: .download_%
 .download_%:
-	echo -e "\ndownloading %..."
+	@echo -e "\n\033[1mdownloading $*...\033[0m"
 	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
 	touch $@
 
-configure_%: .configure_%
-.configure_%: download_% 
-	echo -e "\nconfiguring %..."
-	mkdir -p $*/build-$(target)
-	cd -p $*/build-$(target); \
+.configure_%_$(target): .download_% 
+	@echo -e "\n\033[1mconfiguring $*...\033[0m"
+	mkdir -p upstream/$*/build-$(target)
+	cd upstream/$*/build-$(target); \
 		$(setcc) ../src/configure \
 		--target=$(target) \
 		--prefix=`pwd`/../../install \
 		$(configure_$*) \
-		$(configure_$*)-$(target)
+		$(configure_$*-$(target))
 	touch $@
 
-install_%: .install_%
-.install_%: configure_%
-	echo -e "\nbuilding $*..."
+.install_%_$(target): .configure_%_$(target)
+	@echo -e "\n\033[1mbuilding $*...\033[0m"
 	cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make
-	echo -e "\ninstalling $*..."
+	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
 	touch $@
 
-.install_freetype-2.1.4: download_freetype-2.1.4 install_binutils-2.13.2.1 install_gcc-3.3
+.install_freetype-2.1.4_$(target): .download_freetype-2.1.4_$(target) .install_binutils-2.13.2.1_$(target) .install_gcc-3.3_$(target)
+	@echo -e "\n\033[1mbuilding freetype $*...\033[0m"
 	cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../install/bin make CC=mips-gcc AR=mips-ar
 	../install/bin/mips-ranlib freetype-2.1.4/objs/libfreetype.a
 	touch $@
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
 .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 -n 'PATH=$$PATH:upstream/install/bin/ jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
-	(type jikes && (jikes --version | grep "Version 1.18")) || make jikes-1.18/src jikes-1.18/.installed
+	(type jikes && (jikes --version | grep "Version 1.18")) || make install_jikes-1.18
 	echo -n "$(jikes_flags) -bootclasspath " >> .jikes
 	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
 	echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }"  >> GetBootClassPath.java