aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes/jamvm/jamvm-initial_1.4.5.bb8
-rw-r--r--recipes/jamvm/jamvm-initial_1.5.0.bb6
2 files changed, 11 insertions, 3 deletions
diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb
index c71811dd4e..1566deba61 100644
--- a/recipes/jamvm/jamvm-initial_1.4.5.bb
+++ b/recipes/jamvm/jamvm-initial_1.4.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
DEPENDS = "zlib-native classpath-initial jikes-initial"
-PR = "r0"
+PR = "r1"
PROVIDES = "virtual/java-initial"
@@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm"
inherit native autotools
+# libdir must be modified so that jamvm-initial and -native
+# do not interfere
EXTRA_OECONF = "\
--with-classpath-install-dir=${prefix} \
--program-suffix=-initial \
+ --libdir=${STAGING_LIBDIR}/jamvm-initial \
"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+# jamvm-initial has to run some binaries which need lots of memory.
+CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB"
do_compile() {
oe_runmake \
diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb
index a1c415dd62..1566deba61 100644
--- a/recipes/jamvm/jamvm-initial_1.5.0.bb
+++ b/recipes/jamvm/jamvm-initial_1.5.0.bb
@@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm"
inherit native autotools
+# libdir must be modified so that jamvm-initial and -native
+# do not interfere
EXTRA_OECONF = "\
--with-classpath-install-dir=${prefix} \
--program-suffix=-initial \
+ --libdir=${STAGING_LIBDIR}/jamvm-initial \
"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+# jamvm-initial has to run some binaries which need lots of memory.
+CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB"
do_compile() {
oe_runmake \