X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=82fcb38e23081dc0f332faf3f9280795dddd1bfd;hp=75d8a817b7af91553bc6ba47b71ca30e53b39818;hb=aebf24e2408d92d1143a09c42258bb38a448b2ec;hpb=2218a9cd7dd8e7fa11aef4156f54b6b76623c531 diff --git a/Makefile.upstream b/Makefile.upstream index 75d8a81..82fcb38 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -4,8 +4,7 @@ # # deal with Apple's brokenness -setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))" -setcc += PATH=`pwd`/upstream/install/bin:$$PATH +setcc := $(shell test `uname` = Darwin && echo "CC=\"/usr/bin/gcc3 -no-cpp-precomp\"") # where to get stuff url_newlib-1.11.0 := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz @@ -15,43 +14,82 @@ 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://www.megacz.com/tmp/jikes-1.18.tgz #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz +url_jikes-1.18 := http://dist.xwt.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 .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 +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 + touch upstream/darwin-linker/src/cctools/misc/makeUser.c upstream/darwin-linker/src/cctools/misc/make.h + make -C upstream/darwin-linker/src/cctools/misc libtool.NEW make -C upstream/darwin-linker/src/cctools/ld; true make -C upstream/darwin-linker/src/cctools/as 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 + 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 + 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 + 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 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 -s ../powerpc-apple-darwin/bin/ld powerpc-apple-darwin-ld - cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/as powerpc-apple-darwin-as - cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/ar powerpc-apple-darwin-ar - cd upstream/install/bin; ln -s ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip + 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 + 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 + 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) +.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-headers=../../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 -configure_gcc-3.3-mips := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads +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-headers=$(shell pwd)/upstream/install/$(target)/include +configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj +configure_gcc-3.3 += --enable-shared +configure_gcc-3.3_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib +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 --enable-hash-synchronization --disable-multilib + +environment_newlib-1.11.0_mips-unknown-elf += TARGET_CFLAGS="-O3 -ffunction-sections -fdata-sections" + +# 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 +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_libmspack-20030726_$(target) += OPTIM="-ffunction-sections -fdata-sections -O3" + + +environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bin:$$PATH .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) @@ -64,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_%: @@ -71,40 +113,78 @@ vendor: .vendor; @true 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 + 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 touch $@ .configure_%_$(target): .download_% @echo -e "\n\033[1mconfiguring $*...\033[0m" mkdir -p upstream/$*/build-$(target) cd upstream/$*/build-$(target); \ - $(setcc) ../src/configure \ + $(setcc) $(environment_$*_$(target)) ../src/configure \ --target=$(target) \ - --prefix=`pwd`/../../install \ + --prefix=`cd ../..; pwd`/install \ $(configure_$*) \ - $(configure_$*-$(target)) + $(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 ../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_newlib-1.11.0_mips-unknown-elf: .install_mips2java + touch $@ + +.install_gcc-3.3_mips-unknown-elf: .install_mips2java + touch $@ + +.install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .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 \ + CFLAGS="-c -ffunction-sections -fdata-sections -O3" + 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 make - @echo -e "\n\033[1minstalling $*...\033[0m" - cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install + cd upstream/$*/build-$(target); \ + $(setcc) PATH=$$PATH:`pwd`/../../install/bin \ + $(environment_$*_$(target)) \ + make $(setcc) $(environment_$*_$(target)) 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 +.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true + +.install_%_$(target): .build_%_$(target) + @echo -e "\n\033[1minstalling $*...\033[0m" + cd upstream/$*/build-$(target); \ + $(setcc) PATH=$$PATH:`pwd`/../../install/bin \ + $(environment_$*_$(target)) \ + make install $(setcc) $(environment_$*_$(target)) 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 install_jikes-1.18 + #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 + (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 echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java @@ -112,7 +192,9 @@ vendor: .vendor; @true 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 '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