summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/java-library.bbclass3
-rw-r--r--recipes-core/classpath/classpath.inc2
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc2
-rwxr-xr-xrecipes-core/jamvm/files/java6
-rw-r--r--recipes-core/jamvm/jamvm.inc9
5 files changed, 14 insertions, 8 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 749f1fb..a74c8d3 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -9,9 +9,6 @@
9# to set JPN manually! 9# to set JPN manually!
10 10
11inherit java 11inherit java
12export LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${STAGING_LIBDIR_NATIVE}/classpath:${STAGING_LIBDIR_NATIVE}/jamvm"
13export BOOTCLASSPATH = "${STAGING_DATADIR_NATIVE}/jamvm/classes.zip:${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
14
15 12
16# use java_stage for native packages 13# use java_stage for native packages
17JAVA_NATIVE_STAGE_INSTALL = "1" 14JAVA_NATIVE_STAGE_INSTALL = "1"
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc
index 81476c0..1bdfd78 100644
--- a/recipes-core/classpath/classpath.inc
+++ b/recipes-core/classpath/classpath.inc
@@ -28,8 +28,6 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
28S = "${WORKDIR}/${PBN}-${PV}" 28S = "${WORKDIR}/${PBN}-${PV}"
29 29
30export JAVA = "java" 30export JAVA = "java"
31export LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${STAGING_LIBDIR_NATIVE}/classpath:${STAGING_LIBDIR_NATIVE}/jamvm"
32export BOOTCLASSPATH = "${STAGING_DATADIR_NATIVE}/jamvm/classes.zip:${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
33 31
34EXTRA_OECONF = "\ 32EXTRA_OECONF = "\
35 --with-glibj \ 33 --with-glibj \
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index aa105b7..1f193e1 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -35,8 +35,6 @@ B = "${S}/build"
35# openjdk looks in /usr/include and /usr/lib for freetype by default. 35# openjdk looks in /usr/include and /usr/lib for freetype by default.
36export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" 36export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
37export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" 37export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
38export LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${STAGING_LIBDIR}/classpath:${STAGING_LIBDIR}/jamvm"
39export BOOTCLASSPATH = "${STAGING_DATADIR}/jamvm/classes.zip:${STAGING_DATADIR}/classpath/glibj.zip"
40 38
41# OpenJDK supports parallel compilation but uses a plain number for this. 39# OpenJDK supports parallel compilation but uses a plain number for this.
42# In OE we have PARALLEL_MAKE which is the actual option passed to make, 40# In OE we have PARALLEL_MAKE which is the actual option passed to make,
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 @@
1#!/bin/sh
2
3IFS=""
4export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:STAGING_LIBDIR_NATIVE/classpath:STAGING_LIBDIR_NATIVE/jamvm"
5export BOOTCLASSPATH="STAGING_DATADIR_NATIVE/jamvm/classes.zip:STAGING_DATADIR_NATIVE/classpath/glibj.zip"
6exec 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
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
27ARM_INSTRUCTION_SET = "arm" 27ARM_INSTRUCTION_SET = "arm"
28 28
29do_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
30EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" 36EXTRA_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
37do_install_append_virtclass-native() { 43do_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
42PRIVATE_LIBS = "libjvm.so" 49PRIVATE_LIBS = "libjvm.so"