X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=lang%2Fjamvm%2FMakefile;h=a56d29ec255151503c8f36c291c16707e860642b;hb=9817b65bb11ba8910e3e80508e8d38f702d6ae94;hp=bf7ae808103a7e86b6302c5f2126b01239142a3b;hpb=262756c267b584220622b9428b1aaeae264224c5;p=packages.git

diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile
index bf7ae8081..a56d29ec2 100644
--- a/lang/jamvm/Makefile
+++ b/lang/jamvm/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jamvm
-PKG_VERSION:=1.5.3
-PKG_RELEASE:=1
+PKG_VERSION:=1.6.0-git
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/jamvm
-PKG_MD5SUM:=ce886163658d748113b0570dfae12aea
+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:=66a728a3cb8dad0e3773035c4049eb5f
+
+PKG_USE_MIPS16:=0
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,7 +31,7 @@ define Package/jamvm
   CATEGORY:=Languages
   TITLE:=A compact Java Virtual Machine
   URL:=http://sourceforge.net/projects/jamvm
-  DEPENDS:=+libffi +zlib +libpthread @!mips
+  DEPENDS:=+zlib +libpthread +librt +classpath @!avr32
 endef
 
 define Package/jamvm/description
@@ -35,24 +43,27 @@ define Package/jamvm/description
  Native Interface (JNI) and the Reflection API.
 endef
 
-CONFIGURE_ARGS+= \
-	--enable-ffi \
-	--disable-int-threading \
+CONFIGURE_ARGS += \
+	--with-java-runtime-library=gnuclasspath \
+	--with-classpath-install-dir=/usr \
+	--disable-int-inlining \
+	--disable-shared \
+	--without-pic
 
-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/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))