X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile.upstream;h=fbbaa103eaeaeb9c9f057e1da56f34b4e82ab255;hb=ce46ffc931712d600b6f7ed4a426e4c1751ef4b9;hp=139740531adaa833f7a1e6333c0008a03d54fdf8;hpb=3140c52a5c269771535a43861b64ed34926e14d7;p=org.ibex.core.git diff --git a/Makefile.upstream b/Makefile.upstream index 1397405..fbbaa10 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.webmeta.com/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,22 +61,29 @@ 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 +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 @@ -85,6 +94,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 +117,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 @@ -157,9 +174,11 @@ endif .download_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 + 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_mips2java: .download_mips2java (cd upstream/mips; make) @@ -180,7 +199,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 @@ -190,13 +209,16 @@ 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 +ifeq ($(shell javac -version 2>&1 | head -n 1),javac 1.5.0-beta) + 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 @@ -205,6 +227,7 @@ endif javac GetBootClassPath.java java -cp . GetBootClassPath >> .jikes rm GetBootClassPath.* +endif echo 'EXIT=$$?' >> .jikes echo 'exit $$EXIT' >> .jikes mv .jikes .jikes+