summaryrefslogtreecommitdiff
path: root/multitech
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2012-03-13 11:30:59 -0500
committerJesse Gilles <jgilles@multitech.com>2012-03-13 13:18:00 -0500
commit84cbc17814089dd1925b78b24ddda9ba34d6c8e0 (patch)
tree3c66e3182e78fa20fe1e832d664713b5a6e32b20 /multitech
parentb4a2c098082ade202b29ad710359f6a96b94f511 (diff)
openjdk-6: update to 6b24-1.11.1
Diffstat (limited to 'multitech')
-rw-r--r--multitech/conf/distro/java.inc6
-rw-r--r--multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend5
2 files changed, 6 insertions, 5 deletions
diff --git a/multitech/conf/distro/java.inc b/multitech/conf/distro/java.inc
index 7f946c0..7561318 100644
--- a/multitech/conf/distro/java.inc
+++ b/multitech/conf/distro/java.inc
@@ -18,9 +18,5 @@ PREFERRED_VERSION_jamvm-native = ""
PREFERRED_VERSION_libecj-bootstrap = "3.6.2"
-PREFERRED_VERSION_cacaoh-native = "0.99.4"
-PREFERRED_VERSION_cacao = "0.99.4"
-
-# use latest openjdk
-PREFERRED_VERSION_openjdk-6-jre = ""
+PREFERRED_VERSION_openjdk-6-jre = "6b24-1.11.1"
PREFERRED_VERSION_icedtea6-native = "1.8.11"
diff --git a/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend b/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend
new file mode 100644
index 0000000..741bb57
--- /dev/null
+++ b/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend
@@ -0,0 +1,5 @@
+# skip building shark
+WITH_ADDITIONAL_VMS = "cacao,jamvm"
+
+# don't need llvm if we aren't building shark
+DEPENDS := "${@bb.data.getVar('DEPENDS',d,1).replace(' llvm2.8 ',' ')}"