diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-09-29 13:59:14 +0000 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-09-29 21:52:23 +0200 |
commit | b7fe352e2cec76424b6c1017dbf84a28294ad9b7 (patch) | |
tree | dda616f52b9760ca4f492bb97aa19474273ee250 /recipes-core/jamvm/jamvm.inc | |
parent | 1f41f82b9241a69a4a1d61e2c547477a1ac84b5a (diff) | |
download | meta-java-b7fe352e2cec76424b6c1017dbf84a28294ad9b7.tar.gz |
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
Diffstat (limited to 'recipes-core/jamvm/jamvm.inc')
-rw-r--r-- | recipes-core/jamvm/jamvm.inc | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
26 | # This uses 32 bit arm, so force the instruction set to arm, not thumb | 26 | # This uses 32 bit arm, so force the instruction set to arm, not thumb |
27 | ARM_INSTRUCTION_SET = "arm" | 27 | ARM_INSTRUCTION_SET = "arm" |
28 | 28 | ||
29 | do_configure_append_virtclass-native() { | ||
30 | sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ | ||
31 | -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ | ||
32 | ${WORKDIR}/java | ||
33 | } | ||
34 | |||
29 | 35 | ||
30 | EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" | 36 | EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" |
31 | 37 | ||
@@ -36,7 +42,8 @@ EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ | |||
36 | 42 | ||
37 | do_install_append_virtclass-native() { | 43 | do_install_append_virtclass-native() { |
38 | install -d ${D}${bindir} | 44 | install -d ${D}${bindir} |
39 | ln -s ${bindir}/jamvm ${D}${bindir}/java | 45 | install -m 0755 ${WORKDIR}/java ${D}${bindir}/java |
46 | |||
40 | } | 47 | } |
41 | 48 | ||
42 | PRIVATE_LIBS = "libjvm.so" | 49 | PRIVATE_LIBS = "libjvm.so" |