From b7fe352e2cec76424b6c1017dbf84a28294ad9b7 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 29 Sep 2013 13:59:14 +0000 Subject: jamvm-native: separate bootclasspath out into shell script * instead of hardcode BCP and LD_LIBRARY_PATH into serval files use a shell script and set them there * this allow us again to use other vms for java-native --- recipes-core/jamvm/files/java | 6 ++++++ recipes-core/jamvm/jamvm.inc | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100755 recipes-core/jamvm/files/java (limited to 'recipes-core/jamvm') diff --git a/recipes-core/jamvm/files/java b/recipes-core/jamvm/files/java new file mode 100755 index 0000000..27cf094 --- /dev/null +++ b/recipes-core/jamvm/files/java @@ -0,0 +1,6 @@ +#!/bin/sh + +IFS="" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:STAGING_LIBDIR_NATIVE/classpath:STAGING_LIBDIR_NATIVE/jamvm" +export BOOTCLASSPATH="STAGING_DATADIR_NATIVE/jamvm/classes.zip:STAGING_DATADIR_NATIVE/classpath/glibj.zip" +exec jamvm ${1+"$@"} diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index e82a780..991b413 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -26,6 +26,12 @@ inherit java autotools update-alternatives # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" +do_configure_append_virtclass-native() { + sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ + -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ + ${WORKDIR}/java +} + EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" @@ -36,7 +42,8 @@ EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ do_install_append_virtclass-native() { install -d ${D}${bindir} - ln -s ${bindir}/jamvm ${D}${bindir}/java + install -m 0755 ${WORKDIR}/java ${D}${bindir}/java + } PRIVATE_LIBS = "libjvm.so" -- cgit v1.2.3-54-g00ecf