From 3d813c9218d3e9ff10865f51a1f11c5709fa958b Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 17 Feb 2012 21:09:54 +0100 Subject: angstrom-jalimo.conf,sane-toolchain-java.inc: use jamvm-git instead of cacao-hg as java-native * latest jamvm seems to be more stable --- conf/distro/include/angstrom-jalimo.conf | 4 ++-- conf/distro/include/sane-toolchain-java.inc | 2 +- 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 -- cgit 1.2.3-korg