aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schuster <robertschuster@fsfe.org>2010-01-20 03:40:00 +0000
committerMarcin Juszkiewicz <marcin@buglabs.net>2010-01-20 15:11:22 +0100
commit5df184fe3a38afc2361065b1486f9cf4378c538b (patch)
tree541e98e750e4731cff3d2dae643cf33b7b15f171
parent034d1b6359fea39cc2c106fa2befb315f38d0868 (diff)
downloadopenembedded-5df184fe3a38afc2361065b1486f9cf4378c538b.tar.gz
jamvm-initial 1.x.y: Use 512MB for Xmx by default, install libjvm in private directory.
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Acked-by: Koen Kooi <koen@openembedded.org>
-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 050cf83005..4ef56c1576 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 \