From 1b0b0e3f85464178c997ef9f0943d0ff99e85edf Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 14 Jan 2008 15:07:22 +0000 Subject: [PATCH] jamvm: Cleanup and new version. - moved all versions prior to 1.4.5 to obsolete/ (including patches) - added recipe for 1.5.0 - made 1.4.5 and 1.5.0 use a common include file --- .../jamvm-1.3.1-size-defaults.patch | 0 packages/jamvm/jamvm.inc | 22 +++++++++++++++++ packages/jamvm/jamvm/sh3sh4-support.patch | 11 --------- packages/jamvm/jamvm_1.4.5.bb | 24 +------------------ packages/jamvm/jamvm_1.5.0.bb | 3 +++ .../jamvm}/.mtn2git_empty | 0 .../jamvm/files}/.mtn2git_empty | 0 .../files/jamvm-1.3.1-size-defaults.patch | 12 ++++++++++ .../obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty | 0 .../jamvm/jamvm-1.3.0/heap-size.patch | 0 packages/{ => obsolete}/jamvm/jamvm_1.3.0.bb | 0 packages/{ => obsolete}/jamvm/jamvm_1.3.1.bb | 0 packages/{ => obsolete}/jamvm/jamvm_1.3.2.bb | 0 packages/{ => obsolete}/jamvm/jamvm_1.4.1.bb | 0 14 files changed, 38 insertions(+), 34 deletions(-) rename packages/jamvm/{jamvm => files}/jamvm-1.3.1-size-defaults.patch (100%) create mode 100644 packages/jamvm/jamvm.inc delete mode 100644 packages/jamvm/jamvm/sh3sh4-support.patch create mode 100644 packages/jamvm/jamvm_1.5.0.bb rename packages/{jamvm/jamvm-1.3.0 => obsolete/jamvm}/.mtn2git_empty (100%) rename packages/{jamvm/jamvm => obsolete/jamvm/files}/.mtn2git_empty (100%) create mode 100644 packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch create mode 100644 packages/obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty rename packages/{ => obsolete}/jamvm/jamvm-1.3.0/heap-size.patch (100%) rename packages/{ => obsolete}/jamvm/jamvm_1.3.0.bb (100%) rename packages/{ => obsolete}/jamvm/jamvm_1.3.1.bb (100%) rename packages/{ => obsolete}/jamvm/jamvm_1.3.2.bb (100%) rename packages/{ => obsolete}/jamvm/jamvm_1.4.1.bb (100%) diff --git a/packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch b/packages/jamvm/files/jamvm-1.3.1-size-defaults.patch similarity index 100% rename from packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch rename to packages/jamvm/files/jamvm-1.3.1-size-defaults.patch diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc new file mode 100644 index 0000000000..36378370c5 --- /dev/null +++ b/packages/jamvm/jamvm.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" + +DEPENDS = "zlib classpath virtual/javac-native" +RDEPENDS = "classpath" + +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz" + +RPROVIDES_jamvm = "java2-runtime" + +# This uses 32 bit arm, so force the instruction set to arm, not thumb +ARM_INSTRUCTION_SET = "arm" + +inherit autotools update-alternatives + +EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" +CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" + +ALTERNATIVE_NAME = "java" +ALTERNATIVE_PATH = "${bindir}/jamvm" +ALTERNATIVE_PRIORITY = "10" diff --git a/packages/jamvm/jamvm/sh3sh4-support.patch b/packages/jamvm/jamvm/sh3sh4-support.patch deleted file mode 100644 index 8fa0d8c161..0000000000 --- a/packages/jamvm/jamvm/sh3sh4-support.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac_orig 2006-05-10 21:48:31.000000000 +0000 -+++ configure.ac 2006-05-10 21:49:56.000000000 +0000 -@@ -66,6 +66,8 @@ - arm*-*-linux*) host_cpu=arm host_os=linux ;; - arm*-*-openbsd*) host_cpu=arm host_os=linux libdl_needed=no ;; - arm*-*-freebsd*) host_cpu=arm host_os=linux libdl_needed=no ;; -+sh3-*-linux*) host_cpu=sh3 host_os=linux libdl_needed=no ;; -+sh4-*-linux*) host_cpu=sh4 host_os=linux libdl_needed=no ;; - powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;; - powerpc*-*-openbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;; - powerpc*-*-freebsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;; diff --git a/packages/jamvm/jamvm_1.4.5.bb b/packages/jamvm/jamvm_1.4.5.bb index 489b4fb94b..ab1fb0484e 100644 --- a/packages/jamvm/jamvm_1.4.5.bb +++ b/packages/jamvm/jamvm_1.4.5.bb @@ -1,24 +1,2 @@ -DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." -HOMEPAGE = "http://jamvm.sourceforge.net/" -LICENSE = "GPL" -PRIORITY = "optional" -SECTION = "interpreters" +SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1" -DEPENDS = "zlib classpath" -RDEPENDS = "classpath (>= 0.18) classpath-common (>= 0.18)" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ - file://jamvm-1.3.1-size-defaults.patch;patch=1" - -# This uses 32 bit arm, so force the instruction set to arm, not thumb -ARM_INSTRUCTION_SET = "arm" - -inherit autotools update-alternatives - -EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" -CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" - -PROVIDES = "virtual/java" -ALTERNATIVE_NAME = "java" -ALTERNATIVE_PATH = "${bindir}/jamvm" -ALTERNATIVE_PRIORITY = "10" diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb new file mode 100644 index 0000000000..ffd0997572 --- /dev/null +++ b/packages/jamvm/jamvm_1.5.0.bb @@ -0,0 +1,3 @@ +PR = "r0" + + diff --git a/packages/jamvm/jamvm-1.3.0/.mtn2git_empty b/packages/obsolete/jamvm/.mtn2git_empty similarity index 100% rename from packages/jamvm/jamvm-1.3.0/.mtn2git_empty rename to packages/obsolete/jamvm/.mtn2git_empty diff --git a/packages/jamvm/jamvm/.mtn2git_empty b/packages/obsolete/jamvm/files/.mtn2git_empty similarity index 100% rename from packages/jamvm/jamvm/.mtn2git_empty rename to packages/obsolete/jamvm/files/.mtn2git_empty diff --git a/packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch b/packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch new file mode 100644 index 0000000000..a41beee982 --- /dev/null +++ b/packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch @@ -0,0 +1,12 @@ +--- jamvm-1.3.1.orig/src/jam.h 2005-07-17 23:53:34.000000000 +0200 ++++ jamvm-1.3.1/src/jam.h 2005-07-17 23:54:17.000000000 +0200 +@@ -548,7 +548,9 @@ + #endif + + /* default size of the Java stack */ ++#ifndef DEFAULT_STACK + #define DEFAULT_STACK 64*KB ++#endif + + /* size of emergency area - big enough to create + a StackOverflow exception */ diff --git a/packages/obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty b/packages/obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/jamvm/jamvm-1.3.0/heap-size.patch b/packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch similarity index 100% rename from packages/jamvm/jamvm-1.3.0/heap-size.patch rename to packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch diff --git a/packages/jamvm/jamvm_1.3.0.bb b/packages/obsolete/jamvm/jamvm_1.3.0.bb similarity index 100% rename from packages/jamvm/jamvm_1.3.0.bb rename to packages/obsolete/jamvm/jamvm_1.3.0.bb diff --git a/packages/jamvm/jamvm_1.3.1.bb b/packages/obsolete/jamvm/jamvm_1.3.1.bb similarity index 100% rename from packages/jamvm/jamvm_1.3.1.bb rename to packages/obsolete/jamvm/jamvm_1.3.1.bb diff --git a/packages/jamvm/jamvm_1.3.2.bb b/packages/obsolete/jamvm/jamvm_1.3.2.bb similarity index 100% rename from packages/jamvm/jamvm_1.3.2.bb rename to packages/obsolete/jamvm/jamvm_1.3.2.bb diff --git a/packages/jamvm/jamvm_1.4.1.bb b/packages/obsolete/jamvm/jamvm_1.4.1.bb similarity index 100% rename from packages/jamvm/jamvm_1.4.1.bb rename to packages/obsolete/jamvm/jamvm_1.4.1.bb -- 2.39.5