[oe-commits] Robert Schuster : angstrom-jalimo.conf:

[git version control]

Module: openembedded.git
Branch: master
Commit: 54ebe3860b6041a5ff7fb917b7215bb9bac9e0ae
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=54ebe3860b6041a5ff7fb917b7215bb9bac9e0ae

Author: Robert Schuster <rschus at tarub.tarent.buero>
Date:   Tue Mar  8 13:38:14 2011 +0100

angstrom-jalimo.conf:
sane-toolchain-java.inc:
 * make assignments for
	virtual/java-initial,
	virtual/java-native and
	virtual/javac-native
  weak (allows changing in local.conf)

---

 conf/distro/include/angstrom-jalimo.conf    |    4 ++--
 conf/distro/include/sane-toolchain-java.inc |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf
index 9ba4c70..f04daa4 100644
--- a/conf/distro/include/angstrom-jalimo.conf
+++ b/conf/distro/include/angstrom-jalimo.conf
@@ -5,13 +5,13 @@ PREFERRED_VERSION_jamvm-initial = "1.4.5"
 PREFERRED_VERSION_classpath-initial = "0.93"
 
 # Native VM
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native"
 PREFERRED_VERSION_jamvm-native = "1.5.3"
 #PREFERRED_VERSION_cacao-native = "0.99.3"
 PREFERRED_VERSION_classpath-native = "0.98"
 
 # Native compiler settings
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native"
 PREFERRED_VERSION_libecj-bootstrap = "3.6"
 
 # Target VM
diff --git a/conf/distro/include/sane-toolchain-java.inc b/conf/distro/include/sane-toolchain-java.inc
index a0f5792..6b51a37 100644
--- a/conf/distro/include/sane-toolchain-java.inc
+++ b/conf/distro/include/sane-toolchain-java.inc
@@ -1,6 +1,6 @@
 # Set PREFFERED and VERSION stuff for working java-toolchain
 
-PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial"
+PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native"
 PREFERRED_VERSION_classpath-native = "0.98"
 PREFERRED_VERSION_classpath = "0.98"