X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=07e31859c235d678eb5ba279a17120191673f59e;hb=d8ee62e5c00b793cce08bb509ed0a46841238ba8;hp=72189f272085276ef552f6b894ce533cb13aeaa5;hpb=6cb9dd3d390fc866c0de747ded53e012859c454d;p=org.ibex.core.git diff --git a/Makefile.upstream b/Makefile.upstream index 72189f2..07e3185 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -4,7 +4,7 @@ # # deal with Apple's brokenness -setcc := CC="$(patsubst Darwin,/usr/bin/gcc3 -no-cpp-precomp,$(findstring Darwin,$(shell uname)))" +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 @@ -17,37 +17,66 @@ 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 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 + 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/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/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 + 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 + 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 -s ../../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 += --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/$(target)/include +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 -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 + +# 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 + +environment_gcc_3.3_$(target) := PATH=$(shell pwd)/upstream/install/bin:$$PATH -.PRECIOUS: .vendor .download_%_$(target) .configure_%_$(target) .install_%_$(target) +.PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) # vendor-supplied binaries and headers; this is stuff that comes with various OSes vendor: .vendor; @true @@ -72,24 +101,29 @@ vendor: .vendor; @true @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)) 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 + cd upstream/$*/build-$(target); \ + $(setcc) PATH=$$PATH:`pwd`/../../install/bin \ + $(environment_$*_$(target)) \ + make $(setcc) $(environment_$*_$(target)) @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_$(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 + 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 @@ -109,4 +143,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