X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=64dd9b566c6eb264206c37882eab27bd5ca7de31;hb=57f0d69080cef7811a1eb3d4020b22e548be5dbf;hp=342585556e151be843763b60cc197e5775ed65d6;hpb=809f99d7ff5f73c97cf7b65ff946ef557f8339eb;p=org.ibex.core.git diff --git a/Makefile.upstream b/Makefile.upstream index 3425855..64dd9b5 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -1,6 +1,6 @@ ############################################################################# # -# The XWT upstream code Makefile +# The Ibex upstream code Makefile # # deal with Apple's brokenness @@ -13,9 +13,11 @@ 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://dist.xwt.org/jikes-1.18.tgz +url_jikes-1.18 := http://dist.ibex.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 +url_jode-1.1.1 := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz +url_java-getopt-1.0.9 := ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.9.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -54,16 +56,17 @@ endif cd upstream/install/powerpc-apple-darwin/bin; ln -sf ../../bin/c++filt3 touch $@ -# building gcc requires binutils -.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target) # how to configure it ifneq ($(shell uname),$(platform)) configure_gcc-3.3 += --with-headers=$(shell pwd)/upstream/install/$(target)/include endif configure_gcc-3.3 += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi -configure_gcc-3.3 += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld --with-gnu-ld -configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as --with-gnu-as +configure_gcc-3.3 += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld +configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as +ifneq ($(platform),Darwin) +configure_gcc-3.3 += --with-gnu-ld --with-gnu-as +endif configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj configure_gcc-3.3 += --disable-shared --enable-static configure_gcc-3.3_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib @@ -71,6 +74,16 @@ configure_gcc-3.3_i686-pc-mingw32 += --enable-threads=win32 --enable-hash- 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-hash-synchronization --disable-multilib +.install_jode-1.1.1_java: .download_java-getopt-1.0.9 + +configure_jode-1.1.1_java := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac +ifeq ($(shell uname),Darwin) +environment_jode-1.1.1_java := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.1/Classes/classes.jar +else +environment_jode-1.1.1_java := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar +endif +environment_jode-1.1.1_java += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/ + # libjpeg's configury doesn't obey --target environment_jpeg-6b_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH environment_jpeg-6b_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc @@ -103,24 +116,39 @@ ifeq ($(shell uname),Linux) endif touch .vendor +.download_gcc-3.3_powerpc-apple-darwin: + @echo -e "\n\033[1mdownloading $*...\033[0m" + mkdir -p upstream/gcc-3.3 + curl $(url_gcc-3.3) | tar xzf - -C upstream/gcc-3.3 + mv upstream/gcc-3.3/gcc-3.3 upstream/gcc-3.3/src-darwin; true + mv upstream/gcc-3.3/libmspack upstream/gcc-3.3/src-darwin; true + (cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true + (cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true + touch $@ + .download_%: @echo -e "\n\033[1mdownloading $*...\033[0m" mkdir -p upstream/$* curl $(url_$*) | tar xzf - -C upstream/$* -ifeq ($(target),powerpc-apple-darwin) - mv upstream/$*/$* upstream/$*/src-darwin; true - mv upstream/$*/libmspack upstream/$*/src-darwin; true - (test -e upstream/$*/patches && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true - (test -e upstream/$*/patches-darwin && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true -endif -ifneq ($(target),powerpc-apple-darwin) 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 -endif touch $@ -.configure_%_$(target): .download_% +.configure_gcc-3.3_powerpc-apple-darwin: .download_gcc-3.3_powerpc-apple-darwin .install_binutils-2.13.2.1_powerpc-apple-darwin + @echo -e "\n\033[1mconfiguring gcc...\033[0m" + mkdir -p upstream/gcc-3.3/build-$(target) + cd upstream/gcc-3.3/build-$(target); \ + $(setcc) $(environment_gcc-3.3_$(target)) ../src-darwin/configure \ + --target=$(target) \ + --prefix=`cd ../..; pwd`/install \ + $(configure_gcc-3.3) \ + $(configure_gcc-3.3_$(target)) + touch $@ + +.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target) + +.configure_%_$(target): .vendor .download_% @echo -e "\n\033[1mconfiguring $*...\033[0m" mkdir -p upstream/$*/build-$(target) cd upstream/$*/build-$(target); \ @@ -136,18 +164,19 @@ endif cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* . touch $@ -.install_mips2java: - mkdir -p upstream/install - echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass - cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips - cd upstream/mips/upstream; ln -s `cd ../..; pwd`/install - make -C upstream/mips - touch $@ +.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@ +.install_gcc-3.3_mips-unknown-elf: .install_mips2java; touch $@ -.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java +.download_mips2java: + mkdir -p upstream/install + curl http://www.megacz.com/tmp/mips.snapshot.tgz | tar -C upstream -xvzf - +# echo '/1 :pserver:cvs@cvs.ibex.org:2401/ A' >> ~/.cvspass +# cd upstream; cvs -d :pserver:cvs@cvs.ibex.org:/ co mips + cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install touch $@ -.install_gcc-3.3_mips-unknown-elf: .install_mips2java +.install_mips2java: .download_mips2java + (cd upstream/mips; make) touch $@ .install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4 @@ -182,8 +211,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 -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes + echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src ' >> .jikes (type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target= echo -n "$(jikes_flags) -bootclasspath " >> .jikes echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java @@ -192,8 +220,6 @@ 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 'exit $$EXIT' >> .jikes mv .jikes .jikes+ cp .jikes+ .jikes