X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=lang%2Fjamvm%2FMakefile;h=80bf306d371bc84dbe8ac15221cf0ef7a5e0767f;hb=dfbd0c8ec532b5d76a28bf6b2fad8ba34f5d1818;hp=7acd9fc72e2fddd58786744d5dcde463f9cd16a7;hpb=b74621017cbd29b3d8fa50f49e24bf7b01d87e53;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile
index 7acd9fc72e..80bf306d37 100644
--- a/lang/jamvm/Makefile
+++ b/lang/jamvm/Makefile
@@ -1,51 +1,52 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jamvm
-PKG_VERSION:=1.4.4
-PKG_RELEASE:=1
+PKG_VERSION:=1.5.4
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/jamvm
-PKG_MD5SUM:=1b7bc9928c534412e062685a4191651d
-PKG_CAT:=zcat
+PKG_MD5SUM:=7654e9657691f5f09c4f481ed4686176
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/jamvm
+  SUBMENU:=Java
   SECTION:=lang
   CATEGORY:=Languages
-  DEPENDS:=+libffi-sable @!mips
   TITLE:=A compact Java Virtual Machine
-  DESCRIPTION:=\
-	JamVM is a new Java Virtual Machine which conforms to the JVM \\\
-	specification version (blue book). In comparison to most other VM's \\\
-	(free and commercial) it is extremely small.However, unlike other \\\
-	small VMs (e.g. KVM) it is designed to support the full \\\
-	specification, and includes support for object finalisation, \\\
-	Soft/Weak/Phantom References, the Java Native Interface (JNI) and the \\\
-	Reflection API.
   URL:=http://sourceforge.net/projects/jamvm
+  DEPENDS:=+libffi +zlib +libpthread @!avr32 @!mips
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-ffi \
-		--disable-int-threading \
-	)
+define Package/jamvm/description
+ JamVM is a new Java Virtual Machine which conforms to the JVM 
+ specification version (blue book). In comparison to most other VM's (free 
+ and commercial) it is extremely small.However, unlike other small VMs 
+ (e.g. KVM) it is designed to support the full specification, and includes 
+ support for object finalisation, Soft/Weak/Phantom References, the Java 
+ Native Interface (JNI) and the Reflection API.
 endef
 
+CONFIGURE_ARGS+= \
+	--with-classpath-install-dir=/usr \
+	--disable-tls \
+	--enable-ffi \
+	--disable-int-threading \
+
 define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) all
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		all
 endef
 
 ifneq ($(ARCH),mips)
@@ -58,3 +59,4 @@ ifneq ($(ARCH),mips)
 endif
 
 $(eval $(call BuildPackage,jamvm))
+