From 29b1e2852b8eff1a29aaa3bbd7960796337070fc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 8 Apr 2011 18:44:52 +0200
Subject: add openjdk native build to jtools, add jikes for ant compile tests

---
 jtools/jikes/Makefile | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 jtools/jikes/Makefile

(limited to 'jtools/jikes')

diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile
new file mode 100644
index 000000000..b7ceab032
--- /dev/null
+++ b/jtools/jikes/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		jikes
+PKG_VERSION:=		1.22
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/2.22/}
+#http://sourceforge.net/projects/jikes/files/Jikes/1.22/jikes-1.22.tar.bz2/download
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/jikes: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From f3ded116304e1a71bae106ed0a842984de88760d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 9 Apr 2011 11:24:33 +0200
Subject: compile ant as prerequisites with jikes and jamvm

---
 jtools/jikes/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'jtools/jikes')

diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile
index b7ceab032..be31884ff 100644
--- a/jtools/jikes/Makefile
+++ b/jtools/jikes/Makefile
@@ -8,7 +8,6 @@ PKG_VERSION:=		1.22
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/2.22/}
-#http://sourceforge.net/projects/jikes/files/Jikes/1.22/jikes-1.22.tar.bz2/download
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
@@ -26,5 +25,7 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes: $(WRKBUILD)/.compiled
 	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+	$(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/javac
+	$(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/javac
 
 include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From 740a42f993f543c330e2ac5bef45ccf0cd06747c Mon Sep 17 00:00:00 2001
From: wbx <wbx@openadk.org>
Date: Sun, 10 Apr 2011 15:39:23 +0200
Subject: minor tweaks to get ant used

---
 jtools/jikes/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jtools/jikes')

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
 
-- 
cgit v1.2.3