X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=67b8655e49e7e516970f01af87802bfcc0dc7308;hb=c8f04834582049dce7f80507a1b2b6c6210d5c3f;hp=841493fdb44820f1e39bcdb679e1815147eba015;hpb=cb14cc93591e98c961b80a3beed20fe01a1b1d14;p=org.ibex.core.git diff --git a/Makefile.upstream b/Makefile.upstream index 841493f..67b8655 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_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz +url_bcel-5.1 := http://apache.130th.net/jakarta/bcel/binaries/bcel-5.1.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -59,19 +61,25 @@ endif 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 += --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-static --enable-libgcj -configure_gcc-3.3 += --disable-shared --enable-static +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 @@ -85,6 +93,15 @@ 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) @@ -99,8 +116,7 @@ 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 @@ -110,8 +126,8 @@ endif 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 - (test -e upstream/gcc-3.3/patches && cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true - (test -e upstream/gcc-3.3/patches-darwin && cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); 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_%: @@ -152,18 +168,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 @@ -181,7 +198,7 @@ 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 @@ -191,15 +208,18 @@ endif 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 +ifeq ($(shell javac -version 2>&1 | head -n 1),javac 1.5.0-beta) + echo 'PATH=upstream/install/bin:$$PATH $(shell pwd)/upstream/install/bin/i686-pc-linux-gnu-gcj -fCLASSPATH=lib/bcel-5.1.jar:lib/libgcj-minimal.jar:build/class -Ibuild/java/ -Iupstream/mips -Iupstream/mips/build -d build/class/ -C $$@' >> .jikes +# echo -n 'PATH=upstream/install/bin:$$PATH javac -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src' >> .jikes +else + 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 @@ -207,9 +227,8 @@ endif javac GetBootClassPath.java java -cp . GetBootClassPath >> .jikes rm GetBootClassPath.* +endif 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