aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-02-17 21:09:54 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-02-21 12:32:48 +0100
commit3d813c9218d3e9ff10865f51a1f11c5709fa958b (patch)
tree331ba4f30bc736a74f07e37332409e0b1e34b282
parentf568e31896003cd0b48fdff9237da62148b0a875 (diff)
downloadopenembedded-3d813c9218d3e9ff10865f51a1f11c5709fa958b.tar.gz
openembedded-3d813c9218d3e9ff10865f51a1f11c5709fa958b.tar.bz2
openembedded-3d813c9218d3e9ff10865f51a1f11c5709fa958b.zip
angstrom-jalimo.conf,sane-toolchain-java.inc: use jamvm-git instead of cacao-hg as java-native
* latest jamvm seems to be more stable
-rw-r--r--conf/distro/include/angstrom-jalimo.conf4
-rw-r--r--conf/distro/include/sane-toolchain-java.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf
index 3ab8e2d37b..f2d2fa67d2 100644
--- a/conf/distro/include/angstrom-jalimo.conf
+++ b/conf/distro/include/angstrom-jalimo.conf
@@ -5,8 +5,8 @@ PREFERRED_VERSION_jamvm-initial = "1.4.5"
PREFERRED_VERSION_classpath-initial = "0.93"
# Native VM
-PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native"
-SRCREV_pn-cacao-native ?= "c7bf150bfa46"
+PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native"
+PREFERRED_VERSION_jamvm-native = "1.5.5+1.6.0-devel+git0+4617da717ecb05654ea5bb9572338061106a414d"
PREFERRED_VERSION_classpath-native = "0.98"
# Native compiler settings
diff --git a/conf/distro/include/sane-toolchain-java.inc b/conf/distro/include/sane-toolchain-java.inc
index a754f11a94..ff919924b0 100644
--- a/conf/distro/include/sane-toolchain-java.inc
+++ b/conf/distro/include/sane-toolchain-java.inc
@@ -1,7 +1,7 @@
# Set PREFFERED and VERSION stuff for working java-toolchain
PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial"
-PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native"
+PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native"
# target cacao is failing to build
# without this provider we get