From 9e6c8a24b08b4b37fbb5b4a824f113dba0070fdc Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 8 Jan 2012 15:39:29 +0000
Subject: [PATCH] jamvm: update to 1.6.0 git, integrate properly with
 classpath, fixes mips support

git-svn-id: svn://svn.openwrt.org/openwrt/packages@29692 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 lang/jamvm/Makefile | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile
index 80bf306d3..5e671b86b 100644
--- a/lang/jamvm/Makefile
+++ b/lang/jamvm/Makefile
@@ -8,14 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jamvm
-PKG_VERSION:=1.5.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.0-git
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/jamvm
-PKG_MD5SUM:=7654e9657691f5f09c4f481ed4686176
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.berlios.de/jamvm
+PKG_SOURCE_VERSION:=4617da717ecb05654ea5bb9572338061106a414d
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=fd546a48f9e248d21d879664240892a1
 
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,7 +29,7 @@ define Package/jamvm
   CATEGORY:=Languages
   TITLE:=A compact Java Virtual Machine
   URL:=http://sourceforge.net/projects/jamvm
-  DEPENDS:=+libffi +zlib +libpthread @!avr32 @!mips
+  DEPENDS:=+libffi +zlib +libpthread +classpath @!avr32
 endef
 
 define Package/jamvm/description
@@ -37,26 +41,27 @@ define Package/jamvm/description
  Native Interface (JNI) and the Reflection API.
 endef
 
-CONFIGURE_ARGS+= \
-	--with-classpath-install-dir=/usr \
-	--disable-tls \
+CONFIGURE_ARGS += \
 	--enable-ffi \
-	--disable-int-threading \
+	--with-java-runtime-library=gnuclasspath \
+	--with-classpath-install-dir=/usr \
+	--disable-int-threading
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		all
+MAKE_FLAGS += \
+	GLIBJ_ZIP=$(STAGING_DIR)/usr/share/classpath/glibj.zip
+
+define Package/jamvm/install
+	$(INSTALL_DIR) $(1)/usr
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/bin \
+		$(PKG_INSTALL_DIR)/usr/lib \
+		$(PKG_INSTALL_DIR)/usr/share \
+		$(1)/usr/
 endef
 
-ifneq ($(ARCH),mips)
-  define Package/jamvm/install	
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/jamvm $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/jamvm
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/classes.zip $(1)/usr/share/jamvm/
-  endef
-endif
+define Build/InstallDev
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
 
 $(eval $(call BuildPackage,jamvm))
 
-- 
2.11.0