X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=07498137f6329c8520e6d73642a91fb273e6a774;hp=342585556e151be843763b60cc197e5775ed65d6;hb=f45bf5b8d4f76e5c847b8496a2ee7ef96c665077;hpb=809f99d7ff5f73c97cf7b65ff946ef557f8339eb diff --git a/Makefile.upstream b/Makefile.upstream index 3425855..0749813 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 @@ -8,14 +8,16 @@ setcc := $(shell test `uname` = Darwin && echo "CC=\"/usr/bin/gcc3 -no-cpp-preco # where to get stuff 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 -url_freetype-2.1.4 := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz +url_w32api-2.3 := http://unc.dl.sourceforge.net/sourceforge/mingw/w32api-2.3.tar.gz +url_mingw-runtime-3.0 := http://unc.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.0.tar.gz +url_freetype-2.1.4 := http://unc.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_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_vera-1.10 := http://fgo-temp.acc.umu.se/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz +url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz +url_bcel-5.1 := http://www.apache.org/dist/jakarta/bcel/binaries/bcel-5.1.tar.gz +url_gnu.regexp-1.1.4 := ftp://ftp.tralfamadore.com/pub/java/gnu.regexp-1.1.4.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -54,26 +56,34 @@ 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 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj -configure_gcc-3.3 += --disable-shared --enable-static +configure_gcc-3.3 += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi --without-libffi +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-libgcj +configure_gcc-3.3 += --disable-shared --enable-static --disable-jni +configure_binutils-2.13.2.1 += --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-hash-synchronization --disable-multilib +configure_WindowMaker-0.80.2_$(target) += --prefix=$(shell pwd)/upstream/install/$(target) +configure_WindowMaker-0.80.2_$(target) += --host=i686-pc-linux-gnu --x-libraries=$(shell pwd)/upstream/install/$(target)/lib + +#environment_gcc-3.3_i686-pc-linux-gnu += CFLAGS="-Wl,-ldl" + # 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) += CFLAGS="-Os -ffunction-sections -fdata-sections -I ." 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 @@ -84,10 +94,32 @@ 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" +# WindowMaker configury doesn't obey --target +environment_WindowMaker-0.80.2_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH +environment_WindowMaker-0.80.2_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc +environment_WindowMaker-0.80.2_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar" +environment_WindowMaker-0.80.2_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib +environment_WindowMaker-0.80.2_$(target) += LDFLAGS="-lXext -ldl" +make_install_WindowMaker-0.80.2_$(target) := -C WINGs install; make -C wrlib +make_WindowMaker-0.80.2_$(target) := WINGs + environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bin:$$PATH .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) +.download_org.ibex.%: + @echo -e "\033[1mfetching repository org.ibex.$*\033[0m" + @mkdir -p upstream; cd upstream; rm -rf org.ibex.$*; rm -rf org.ibex.$*_* + @cd upstream; darcs get --verbose --partial --repo-name=org.ibex.$* http://$*.ibex.org + @touch $@ + +.build_org.ibex.nestedvm: .vendor .download_org.ibex.nestedvm + cd upstream/org.ibex.nestedvm; make usr=$(shell pwd)/upstream/install all env.sh + touch $@ + +.install_org.ibex.nestedvm: .build_org.ibex.nestedvm + touch $@ + # vendor-supplied binaries and headers; this is stuff that comes with various OSes vendor: .vendor; @true .vendor: @@ -98,29 +130,43 @@ vendor: .vendor; @true 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 + cd upstream/install/i686-pc-linux-gnu/include; rm -rf *; ln -sf /usr/include/* . 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/[a-y]*.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,21 +182,7 @@ 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_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4 +.install_freetype-2.1.4_mips-unknown-elf: .install_org.ibex.nestedvm .download_freetype-2.1.4 cd upstream/freetype-2.1.4/src; \ make setup ansi; \ PATH=$$PATH:`pwd`/../../install/bin make \ @@ -165,36 +197,21 @@ endif cd upstream/$*/build-$(target); \ $(setcc) PATH=$$PATH:`pwd`/../../install/bin \ $(environment_$*_$(target)) \ - make $(setcc) $(environment_$*_$(target)) + make $(make_$*_$(target)) $(setcc) $(environment_$*_$(target)) touch $@ .install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true +.install_gcc-3.3_mips-unknown-elf: .install_org.ibex.nestedvm + touch $@ + .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)) + make $(make_install_$*_$(target)) 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=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 - javac GetBootClassPath.java - 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 - chmod +x .jikes + +