Fixed compile-time dependencies name, and control file

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3304 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 26de49d..717d9c0 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -302,7 +302,7 @@ irssi-compile: glib-compile ncurses-compile
 iperf-compile: uclibc++-compile
 iptables-snmp-compile: net-snmp-compile
 iptraf-compile: ncurses-compile
 iperf-compile: uclibc++-compile
 iptables-snmp-compile: net-snmp-compile
 iptraf-compile: ncurses-compile

-jamvm-compile: libffi-sable-compile
+jamvm-compile: libffi-sable-compile zlib-compile sablevm-classpath-compile

 hostapd-compile: openssl-compile wireless-tools-compile
 httping-compile: openssl-compile
 kismet-compile: uclibc++-compile libpcap-compile ncurses-compile
 hostapd-compile: openssl-compile wireless-tools-compile
 httping-compile: openssl-compile
 kismet-compile: uclibc++-compile libpcap-compile ncurses-compile

diff --git a/openwrt/package/jamvm/Config.in b/openwrt/package/jamvm/Config.in
index ec436a2..befdfa9 100644 (file)
--- a/openwrt/package/jamvm/Config.in
+++ b/openwrt/package/jamvm/Config.in
@@ -2,6 +2,9 @@ config BR2_PACKAGE_JAMVM
         prompt "jamvm .............................A compact Java Virtual Machine"
        tristate
         default m if CONFIG_DEVEL
         prompt "jamvm .............................A compact Java Virtual Machine"
        tristate
         default m if CONFIG_DEVEL

+       select BR2_PACKAGE_ZLIB
+       select BR2_PACKAGE_LIBFFI_SABLE
+       select BR2_PACKAGE_LIBSABLEVM_CLASSPATH

         help
           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
         help
           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

diff --git a/openwrt/package/jamvm/ipkg/jamvm.control b/openwrt/package/jamvm/ipkg/jamvm.control
index 2fb9937..aee8fb8 100644 (file)
--- a/openwrt/package/jamvm/ipkg/jamvm.control
+++ b/openwrt/package/jamvm/ipkg/jamvm.control
@@ -1,9 +1,5 @@
 Package: jamvm
 Priority: optional
 Section: misc
 Package: jamvm
 Priority: optional
 Section: misc

-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: OpenWrt Developer <openwrt-devel@openwrt.org>
-Source: http://jamvm.sourceforge.net/

 Description: A Java Virtual Machine (JVM) implementation
 Description: A Java Virtual Machine (JVM) implementation

-Depends: libffi-sable zlib classpath
+Depends: libffi-sable, zlib, libsablevm-classpath