2003/09/10 03:14:19
[org.ibex.core.git] / Makefile.upstream
index ad7cf73..0a3aaa8 100644 (file)
@@ -18,6 +18,7 @@ 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
+       rm -rf upstream/darwin-linker/src
        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
        cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff
@@ -31,9 +32,9 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
        make -C upstream/darwin-linker/src/cctools/ar
        mkdir -p upstream/install/powerpc-apple-darwin/bin
        cp upstream/darwin-linker/src/cctools/ld/ld_dir/ld.NEW upstream/install/powerpc-apple-darwin/bin/ld.NEW
-       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ld.NEW -dylib_file /usr/lib/system/libmathCommon.A.dylib:"`pwd`"/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -L"`pwd`"/upstream/install/powerpc-apple-darwin/lib $$@\n" > upstream/install/powerpc-apple-darwin/bin/ld
+       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/ld.NEW -dylib_file /usr/lib/system/libmathCommon.A.dylib:"`pwd`"/upstream/install/powerpc-apple-darwin/lib/libmathCommon.A.dylib -L"`pwd`"/upstream/install/powerpc-apple-darwin/lib \$$@\n" > upstream/install/powerpc-apple-darwin/bin/ld
        chmod +x upstream/install/powerpc-apple-darwin/bin/ld
-       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/apple-libtool $$1 -o $$1\n" > upstream/install/powerpc-apple-darwin/bin/ranlib
+       echo -e "#!/bin/sh\n"`pwd`"/upstream/install/powerpc-apple-darwin/bin/apple-libtool \$$1 -o \$$1\n" > upstream/install/powerpc-apple-darwin/bin/ranlib
        chmod +x upstream/install/powerpc-apple-darwin/bin/ranlib
        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
@@ -45,22 +46,26 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ar powerpc-apple-darwin-ar
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ranlib powerpc-apple-darwin-ranlib
        cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip
-       echo -e "#!/bin/sh\nc++filt $$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3
+       echo -e "#!/bin/sh\nc++filt \$$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3
        touch $@
 
 # building gcc requires binutils
 .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)
+
 # how to configure it
 configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
-configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static
-configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as --enable-libgcj
-configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization 
-configure_gcc-3.3-powerpc-apple         := --with-ranlib=$(shell pwd)/upstream/install/bin/powerpc-apple-darwin-ranlib
+configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
+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  := --enable-threads=posix --disable-hash-synchronization --disable-multilib
+configure_gcc-3.3-powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/powerpc-apple-darwin/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
-configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads
+configure_gcc-3.3-mips-unknown-elf      := --enable-languages=c --nfp --enable-multilib --disable-threads
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
@@ -83,7 +88,7 @@ vendor: .vendor; @true
        (test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
        touch $@
 
-.configure_%_$(target):: .download_% 
+.configure_%_$(target): .download_% 
        @echo -e "\n\033[1mconfiguring $*...\033[0m"
        mkdir -p upstream/$*/build-$(target)
        cd upstream/$*/build-$(target); \
@@ -94,6 +99,11 @@ vendor: .vendor; @true
                $(configure_$*-$(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)
        @echo -e "\n\033[1mbuilding $*...\033[0m"
        cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make
@@ -101,12 +111,6 @@ vendor: .vendor; @true
        cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
        touch $@
 
-.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"
@@ -124,4 +128,6 @@ vendor: .vendor; @true
        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
        chmod +x .jikes