From 7356a92fbf59f66521b2e7fdd478b0fa63df052d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Apr 2011 14:25:15 +0200 Subject: add wrappers for ecj and gij, allow to start openjdk bootstrap target jdk compile --- jtools/ecj/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'jtools/ecj/Makefile') diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index 32cfdeb53..a67e9ebd8 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -18,9 +18,16 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \ $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \ - -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj \ + -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar $(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar + echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \ + ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj + chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj + # put a wrapper for java here + echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \$$@" > \ + ${STAGING_JAVA_HOST_DIR}/usr/bin/java + chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java include $(TOPDIR)/mk/tools.mk -- cgit v1.2.3 From f3ded116304e1a71bae106ed0a842984de88760d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 9 Apr 2011 11:24:33 +0200 Subject: compile ant as prerequisites with jikes and jamvm --- jtools/ecj/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'jtools/ecj/Makefile') diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index a67e9ebd8..c4ab831e4 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ecj PKG_VERSION:= 1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa include ../rules.mk @@ -26,8 +26,12 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj # put a wrapper for java here - echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \$$@" > \ + echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \"\$$@\"" > \ ${STAGING_JAVA_HOST_DIR}/usr/bin/java chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java + rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java + cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java include $(TOPDIR)/mk/tools.mk -- cgit v1.2.3