From 54302bd22cbdda4cabf0541cabfb7c3373a92356 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 4 Apr 2011 19:44:06 +0200
Subject: get all prerequisites for openjdk (cross-compile) right

---
 jtools/jamvm/Makefile | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 jtools/jamvm/Makefile

(limited to 'jtools/jamvm')

diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
deleted file mode 100644
index 639b7d875..000000000
--- a/jtools/jamvm/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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:=		jamvm
-PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
-
-ifeq (Darwin,${OStype})
-CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
-CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
-endif
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	cd $(WRKBUILD); env \
-		CC='${CC_FOR_BUILD}' \
-		CXX='${CXX_FOR_BUILD}' \
-	    ./configure \
-		--prefix=/usr \
-		--with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From c8036728b0cc3e1efb72da0d1132e233c06ea4ff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 9 Apr 2011 11:25:03 +0200
Subject: add jamvm

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

(limited to 'jtools/jamvm')

diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
new file mode 100644
index 000000000..defdbd713
--- /dev/null
+++ b/jtools/jamvm/Makefile
@@ -0,0 +1,39 @@
+# 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:=		jamvm
+PKG_VERSION:=		1.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
+
+ifeq (Darwin,${OStype})
+CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
+CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
+endif
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	cd $(WRKBUILD); env \
+               CC='${CC_FOR_BUILD}' \
+               CXX='${CXX_FOR_BUILD}' \
+           ./configure \
+               --prefix=/usr \
+               --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	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
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3