summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <robertschuster@fsfe.org>2010-06-16 18:54:14 +0200
committerRobert Schuster <robertschuster@fsfe.org>2010-06-16 18:55:07 +0200
commitcaa1cc56523416601aa56e42a5e216d35fea6b0f (patch)
tree98bb65c653726dd3bda6f6bc27dc7de5e678d32e
parent85e466de20c13af2e2d74cd9985c686115ceeb90 (diff)
jamvm *: Install libjvm.so into separate folder in ${libdir}.
-rw-r--r--recipes/jamvm/jamvm.inc2
-rw-r--r--recipes/jamvm/jamvm_1.4.5.bb2
-rw-r--r--recipes/jamvm/jamvm_1.5.0.bb2
-rw-r--r--recipes/jamvm/jamvm_1.5.2.bb2
-rw-r--r--recipes/jamvm/jamvm_1.5.3.bb2
5 files changed, 5 insertions, 5 deletions
diff --git a/recipes/jamvm/jamvm.inc b/recipes/jamvm/jamvm.inc
index eabed088ce..327caf9a68 100644
--- a/recipes/jamvm/jamvm.inc
+++ b/recipes/jamvm/jamvm.inc
@@ -14,7 +14,7 @@ ARM_INSTRUCTION_SET = "arm"
inherit java autotools update-alternatives
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
+EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm"
CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
ALTERNATIVE_NAME = "java"
diff --git a/recipes/jamvm/jamvm_1.4.5.bb b/recipes/jamvm/jamvm_1.4.5.bb
index 0e9636622b..fc2c92c2c4 100644
--- a/recipes/jamvm/jamvm_1.4.5.bb
+++ b/recipes/jamvm/jamvm_1.4.5.bb
@@ -1,6 +1,6 @@
require jamvm.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://jamvm-1.3.1-size-defaults.patch"
diff --git a/recipes/jamvm/jamvm_1.5.0.bb b/recipes/jamvm/jamvm_1.5.0.bb
index 2231566bb0..32f78c7065 100644
--- a/recipes/jamvm/jamvm_1.5.0.bb
+++ b/recipes/jamvm/jamvm_1.5.0.bb
@@ -2,7 +2,7 @@ require jamvm.inc
SRC_URI += "file://debian-jni.patch;striplevel=0"
-PR = "r4"
+PR = "r5"
do_configure_prepend() {
# Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/recipes/jamvm/jamvm_1.5.2.bb b/recipes/jamvm/jamvm_1.5.2.bb
index 68949ab44d..7cfeca78d3 100644
--- a/recipes/jamvm/jamvm_1.5.2.bb
+++ b/recipes/jamvm/jamvm_1.5.2.bb
@@ -2,7 +2,7 @@ require jamvm.inc
SRC_URI += "file://debian-jni.patch;striplevel=0"
-PR = "r0"
+PR = "r1"
do_configure_prepend() {
# Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/recipes/jamvm/jamvm_1.5.3.bb b/recipes/jamvm/jamvm_1.5.3.bb
index 19eabfd669..22ca036346 100644
--- a/recipes/jamvm/jamvm_1.5.3.bb
+++ b/recipes/jamvm/jamvm_1.5.3.bb
@@ -2,7 +2,7 @@ require jamvm.inc
SRC_URI += "file://debian-jni.patch;striplevel=0"
-PR = "r0"
+PR = "r1"
do_configure_prepend() {
# Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory