X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=342585556e151be843763b60cc197e5775ed65d6;hb=9b9ac0a0bac4f70cfcc2af30babd4598627490c0;hp=03a1fb8a3abe999d98760b35a973b675991549aa;hpb=baed1480fbb1d933f73f31a0fcf10b07688aacaf;p=org.ibex.core.git diff --git a/Makefile.upstream b/Makefile.upstream index 03a1fb8..3425855 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -1,4 +1,4 @@ -############################################################################# +############################################################################# # # The XWT upstream code Makefile # @@ -7,7 +7,6 @@ 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 url_binutils-2.13.2.1 := ftp://ftp.gnu.org/gnu/binutils/binutils-2.13.2.1.tar.gz url_w32api-2.3 := http://umn.dl.sourceforge.net/sourceforge/mingw/w32api-2.3.tar.gz url_mingw-runtime-3.0 := http://umn.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.0.tar.gz @@ -58,33 +57,19 @@ endif # 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-jvmpi -ifneq ($(platform),Solaris) -configure_gcc-3.3 += --disable-shared -else -configure_gcc-3.3 += --enable-shared -endif -configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj ifneq ($(shell uname),$(platform)) -ifneq ($(target),mips-unknown-elf) -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 += --with-headers=$(shell pwd)/upstream/install/$(target)/include endif -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 += --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 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-unknown-elf += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld -configure_gcc-3.3_mips-unknown-elf += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as -configure_gcc-3.3_mips-unknown-elf += --enable-languages=c --nfp --enable-multilib --disable-threads - -environment_newlib-1.11.0_mips-unknown-elf += TARGET_CFLAGS="-O3 -ffunction-sections -fdata-sections" +configure_gcc-3.3_sparc-sun-solaris2.7 += --enable-threads=posix --disable-hash-synchronization --disable-multilib # libjpeg's configury doesn't obey --target environment_jpeg-6b_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH @@ -99,7 +84,6 @@ environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$( 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) @@ -123,9 +107,17 @@ endif @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_% @@ -139,12 +131,26 @@ endif $(configure_$*_$(target)) touch $@ -.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target) +.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) mkdir -p upstream/libmspack-20030726/build-$(target) cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* . 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 +.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_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 \