diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:12:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:12:44 +0200 |
| commit | 1eccc1842e2c6a0bce4c448320341f1aef1683b7 (patch) | |
| tree | e67c27776cbf411fa7baf4c07ab3ef24e4447c27 /jtools | |
| parent | 11f9e374a5bba6dceb3eb80ac2ae65d74543d91a (diff) | |
cosmetic changes for jtools build
Diffstat (limited to 'jtools')
| -rw-r--r-- | jtools/ant/Makefile | 1 | ||||
| -rw-r--r-- | jtools/ecj/Makefile | 5 | ||||
| -rw-r--r-- | jtools/jamvm/Makefile | 10 |
3 files changed, 5 insertions, 11 deletions
diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile index 07da1f1a0..537668a21 100644 --- a/jtools/ant/Makefile +++ b/jtools/ant/Makefile @@ -20,7 +20,6 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ - BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \ $(BASH) build.sh diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index c9e4559a7..af051f9b9 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -21,7 +21,6 @@ ${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-$(GCJ_VER)/ecj.jar - #$(CP) $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/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 @@ -33,9 +32,5 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ ${STAGING_JAVA_HOST_DIR}/usr/bin/gij chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij - 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 diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile index defdbd713..a85b2d6c8 100644 --- a/jtools/jamvm/Makefile +++ b/jtools/jamvm/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} @@ -23,7 +23,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared CC='${CC_FOR_BUILD}' \ CXX='${CXX_FOR_BUILD}' \ ./configure \ - --prefix=/usr \ + --prefix=$(STAGING_JAVA_HOST_DIR)/usr \ --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr touch $@ @@ -32,8 +32,8 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured touch $@ ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java + ${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE) + ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java + ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java include $(TOPDIR)/mk/tools.mk |