don't pin java version and follow meta-java's suggestions for default provider
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
# Put a 'require conf/distro/include/angstrom-jalimo.conf' in your local.conf if you want to build from the jalimo overlay
|
||||
|
||||
# Possible provider: cacao-native and jamvm-native
|
||||
PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
|
||||
|
||||
# Native compiler settings
|
||||
# Optional since there is only one provider for now
|
||||
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
|
||||
|
||||
# Target VM
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
# Set PREFFERED and VERSION stuff for working java runtime
|
||||
|
||||
PREFERRED_VERSION_openjdk-7-jre = "75b13-2.5.4"
|
||||
PREFERRED_VERSION_icedtea7-native = "2.1.3"
|
||||
|
||||
# jamvm
|
||||
PREFERRED_VERSION_jamvm = "1.5.5+1.6.0-devel+git%"
|
||||
PREFERRED_VERSION_jamvm-native = "1.5.5+1.6.0-devel+git%"
|
||||
|
||||
PREFERRED_PROVIDER_java2-vm = "${DEFAULTJRE}"
|
||||
PREFERRED_PROVIDER_java2-runtime = "${DEFAULTJRE}"
|
||||
PREFERRED_PROVIDER_openjdk-7-jre = "${DEFAULTJRE}"
|
||||
PREFERRED_PROVIDER_virtual/java-initial-native = "jamvm-initial-native"
|
||||
# Possible provider: cacao-initial-native and jamvm-initial-native
|
||||
PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
|
||||
|
||||
DEFAULTJRE ?= "openjdk-7-jre"
|
||||
|
||||
Reference in New Issue
Block a user