X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=c5311075076e551e84d582003c87f25aa6a3cdfa;hp=e170b21c444851a0fa833343af8e790d60142143;hb=4abd3e305d0b87f37d5969016b86ba53574a3210;hpb=36b17515a42e468be7db1346384ce98df3e30882 diff --git a/Makefile.upstream b/Makefile.upstream index e170b21..c531107 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,12 @@ 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_jode-1.1.1 := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz +url_java-getopt-1.0.9 := ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.9.tar.gz +url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -72,6 +75,21 @@ configure_gcc-3.3_i686-pc-mingw32 += --enable-threads=win32 --enable-hash- 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 + +.install_jode-1.1.1_java: .download_java-getopt-1.0.9 + +configure_jode-1.1.1_java := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac +ifeq ($(shell uname),Darwin) +environment_jode-1.1.1_java := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar +else +environment_jode-1.1.1_java := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar +endif +environment_jode-1.1.1_java += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/ + +#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 +103,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 +126,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 +136,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_%: @@ -157,9 +183,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 +208,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,7 +218,7 @@ 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