diff options
| author | wbx <wbx@openadk.org> | 2011-04-10 15:39:23 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-10 15:39:23 +0200 |
| commit | 740a42f993f543c330e2ac5bef45ccf0cd06747c (patch) | |
| tree | b2fd176eb9a7af09f80884904c3d64855aec470e /jtools | |
| parent | 6e461b82e0b6a4060e35c0ef61ca55663924aba1 (diff) | |
minor tweaks to get ant used
Diffstat (limited to 'jtools')
| -rw-r--r-- | jtools/Makefile | 2 | ||||
| -rw-r--r-- | jtools/ant/Makefile | 2 | ||||
| -rw-r--r-- | jtools/jikes/Makefile | 2 | ||||
| -rw-r--r-- | jtools/openjdk/Makefile | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/jtools/Makefile b/jtools/Makefile index af8bdd957..5106df2e6 100644 --- a/jtools/Makefile +++ b/jtools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk TARGETS:= ifneq ($(ADK_PACKAGE_OPENJDK),) -TARGETS+=fastjar gcj jikes jamvm classpath ant ecj openjdk +TARGETS+=fastjar gcj ecj jikes jamvm classpath ant openjdk endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile index d2809428b..666e1e8cb 100644 --- a/jtools/ant/Makefile +++ b/jtools/ant/Makefile @@ -17,7 +17,7 @@ include ../rules.mk install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ant $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared - cp junit* $(WRKBUILD)/lib/optional + cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar cp $(STAGING_JAVA_HOST_DIR)/usr/share/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" \ diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile index be31884ff..c26a0f45b 100644 --- a/jtools/jikes/Makefile +++ b/jtools/jikes/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= jikes PKG_VERSION:= 1.22 PKG_RELEASE:= 1 PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6 -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/2.22/} +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile index b685f9a83..17fe6bbf8 100644 --- a/jtools/openjdk/Makefile +++ b/jtools/openjdk/Makefile @@ -46,11 +46,11 @@ include ../rules.mk OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" OPENJDK_NATIVE_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 -OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj +OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java -$(WRKDIST)/.extract: +$(WRKDIST)/.extract: $(WRKDIST)/.extract_done cd ${WRKDIST}; mkdir openjdk-$(PKG_VERSION); \ tar xzf $(TOPDIR)/dl/openjdk-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C openjdk-$(PKG_VERSION) cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz |