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
+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
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_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/1.4.1/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_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"
+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
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
.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 '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
javac GetBootClassPath.java
java -cp . GetBootClassPath >> .jikes
rm GetBootClassPath.*
+endif
echo 'EXIT=$$?' >> .jikes
echo 'exit $$EXIT' >> .jikes
mv .jikes .jikes+