diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/jamvm | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/jamvm')
| -rw-r--r-- | package/jamvm/Config.in | 16 | ||||
| -rw-r--r-- | package/jamvm/Makefile | 14 | ||||
| -rw-r--r-- | package/jamvm/patches/patch-configure_ac | 10 |
3 files changed, 10 insertions, 30 deletions
diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in deleted file mode 100644 index 0a4c39451..000000000 --- a/package/jamvm/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config ADK_PACKAGE_JAMVM - prompt "jamvm............................. A compact Java Virtual Machine" - tristate - default n - select ADK_PACKAGE_ZLIB - select ADK_PACKAGE_LIBFFI - 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 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. - - http://sourceforge.net/projects/jamvm diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 6b4c7782e..6f7262dc5 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -4,20 +4,25 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jamvm -PKG_VERSION:= 1.5.3 +PKG_VERSION:= 1.5.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= ce886163658d748113b0570dfae12aea +PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 PKG_DESCR:= A Java Virtual Machine (JVM) implementation PKG_SECTION:= misc PKG_DEPENDS:= libffi zlib +PKG_BUILDDEP+= libffi zlib PKG_URL:= http://jamvm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} +PKG_TARGET_DEPENDS:= !foxboard !lemote + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= autotool gnu +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + CONFIGURE_ARGS+= --enable-ffi do-build: @@ -33,6 +38,7 @@ do-install: ${INSTALL_DIR} ${IDIR_JAMVM}/usr/bin ${INSTALL_DIR} ${IDIR_JAMVM}/usr/share/jamvm ${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm ${IDIR_JAMVM}/usr/bin - ${CP} ${WRKINST}/usr/share/jamvm/classes.zip ${IDIR_JAMVM}/usr/share/jamvm + ${CP} ${WRKINST}/usr/share/jamvm/classes.zip \ + ${IDIR_JAMVM}/usr/share/jamvm include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jamvm/patches/patch-configure_ac b/package/jamvm/patches/patch-configure_ac deleted file mode 100644 index a9f128572..000000000 --- a/package/jamvm/patches/patch-configure_ac +++ /dev/null @@ -1,10 +0,0 @@ ---- jamvm-1.5.3.orig/configure.ac 2009-04-14 03:05:57.000000000 +0200 -+++ jamvm-1.5.3/configure.ac 2009-08-28 14:10:40.855322815 +0200 -@@ -39,6 +39,7 @@ i386-*-solaris*) host_cpu=x86 host_os=so - x86_64-*-linux*) host_os=linux ;; - hppa*-*-linux*) host_cpu=parisc host_os=linux ;; - mipsel-*-linux*) host_cpu=mips host_os=linux ;; -+mips64el-*-linux*) host_cpu=mips host_os=linux ;; - amd64-*-openbsd*) host_os=bsd libdl_needed=no ;; - amd64-*-freebsd*) host_os=bsd libdl_needed=no ;; - arm*-*-linux*) host_cpu=arm host_os=linux ;; |