From 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 23 Jan 2014 08:12:50 +0100
Subject: remove jtools/java host dir. use host stuff instead. fix arm
 building.

---
 package/jamvm/Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'package/jamvm')

diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6cca7f5d8..22f20455a 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -16,10 +16,14 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
 PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--with-classpath-install-dir=$(STAGING_HOST_DIR)/usr
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
@@ -31,6 +35,10 @@ ifeq ($(ARCH),arm)
 CONFIGURE_ARGS+=	--disable-tls
 endif
 
+hostpost-install:
+	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java
+	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/java
+
 do-build:
 	${INSTALL_DIR} ${WRKINST}/usr/bin
 	${INSTALL_DIR} ${WRKINST}/usr/share/jamvm
@@ -47,4 +55,5 @@ do-install:
 	${CP} ${WRKINST}/usr/share/jamvm/classes.zip \
 		${IDIR_JAMVM}/usr/share/jamvm
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3