diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-03-01 22:48:10 +0100 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-03-01 22:52:31 +0100 |
commit | fcd4c3a98b06a8eafd45fdafb7752d51bdac1439 (patch) | |
tree | 1fff78c390463e0217a8e6bc04c54f18a82d761f | |
parent | 0a3be14a7e10c506f406744c493877a6c1275876 (diff) | |
download | meta-java-fcd4c3a98b06a8eafd45fdafb7752d51bdac1439.tar.gz |
openjdk-6-release-6b24.inc: disable shark for now and move checksums
* llvm is not working well with arm at the moment, so disabled shark
* move the cacao and jamvm checksums into the release inc file
-rw-r--r-- | recipes-core/openjdk/openjdk-6-release-6b24.inc | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/recipes-core/openjdk/openjdk-6-release-6b24.inc b/recipes-core/openjdk/openjdk-6-release-6b24.inc index 42d1e6f..984d7ba 100644 --- a/recipes-core/openjdk/openjdk-6-release-6b24.inc +++ b/recipes-core/openjdk/openjdk-6-release-6b24.inc | |||
@@ -1,5 +1,9 @@ | |||
1 | require openjdk-6-common.inc | 1 | require openjdk-6-common.inc |
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b24:" | ||
6 | |||
3 | # needed for dis-asm.h | 7 | # needed for dis-asm.h |
4 | DEPENDS += "binutils" | 8 | DEPENDS += "binutils" |
5 | 9 | ||
@@ -7,7 +11,7 @@ EXTRA_OECONF += "\ | |||
7 | --with-jdk-home=${WORKDIR}/fake-jdk \ | 11 | --with-jdk-home=${WORKDIR}/fake-jdk \ |
8 | --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \ | 12 | --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \ |
9 | --with-out-rhino \ | 13 | --with-out-rhino \ |
10 | --with-jaxws-drop-zip=${DL_DIR}/${JAXWS_FILE} \ | 14 | --with-jaxws-drop-zip=${DL_DIR}/${JAXWS_FILE} \ |
11 | --with-jaf-drop-zip=${DL_DIR}/${JAF_FILE} \ | 15 | --with-jaf-drop-zip=${DL_DIR}/${JAF_FILE} \ |
12 | --with-jaxp-drop-zip=${DL_DIR}/${JAXP_FILE} \ | 16 | --with-jaxp-drop-zip=${DL_DIR}/${JAXP_FILE} \ |
13 | --with-cacao-src-zip=${DL_DIR}/${CACAO_VERSION}.tar.gz \ | 17 | --with-cacao-src-zip=${DL_DIR}/${CACAO_VERSION}.tar.gz \ |
@@ -15,8 +19,8 @@ EXTRA_OECONF += "\ | |||
15 | --with-openjdk-src-zip=${DL_DIR}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz \ | 19 | --with-openjdk-src-zip=${DL_DIR}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz \ |
16 | " | 20 | " |
17 | 21 | ||
18 | # List of additional JVM to include in the build. | 22 | # List of additional JVM to include in the build, shark is disabled since 1.11.1 |
19 | WITH_ADDITIONAL_VMS = "shark,cacao,jamvm" | 23 | WITH_ADDITIONAL_VMS = "cacao,jamvm" |
20 | 24 | ||
21 | # Name of the directory containing the compiled output | 25 | # Name of the directory containing the compiled output |
22 | BUILD_DIR = "openjdk.build" | 26 | BUILD_DIR = "openjdk.build" |
@@ -26,8 +30,6 @@ BUILD_DIR_ECJ = "openjdk.build-ecj" | |||
26 | ARM_INSTRUCTION_SET_armv4t = "ARM" | 30 | ARM_INSTRUCTION_SET_armv4t = "ARM" |
27 | 31 | ||
28 | ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;name=iced" | 32 | ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;name=iced" |
29 | SRC_URI[iced.md5sum] = "c381d987f8d2facece8c54e98fd547f8" | ||
30 | SRC_URI[iced.sha256sum] = "15491d7f2f81436aaf87f964d923b95b4bda8f6689198b4999961070b6c68851" | ||
31 | 33 | ||
32 | OPENJDK_VERSION = "b24" | 34 | OPENJDK_VERSION = "b24" |
33 | OPENJDK_DATE = "14_nov_2011" | 35 | OPENJDK_DATE = "14_nov_2011" |
@@ -51,8 +53,14 @@ SRC_URI[jaxp.md5sum] = "9eea471ad474040265c688858fcf09aa" | |||
51 | SRC_URI[jaxp.sha256sum] = "c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012" | 53 | SRC_URI[jaxp.sha256sum] = "c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012" |
52 | 54 | ||
53 | CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_VERSION}.tar.gz;name=cacao" | 55 | CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_VERSION}.tar.gz;name=cacao" |
56 | CACAO_VERSION = "cff92704c4e0" | ||
57 | SRC_URI[cacao.md5sum] = "40b811b8b7f01b51cd21e62255691bc7" | ||
58 | SRC_URI[cacao.sha256sum] = "dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f" | ||
54 | 59 | ||
55 | JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_VERSION}.tar.gz;name=jamvm" | 60 | JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_VERSION}.tar.gz;name=jamvm" |
61 | JAMVM_VERSION = "4617da717ecb05654ea5bb9572338061106a414d" | ||
62 | SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b" | ||
63 | SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d" | ||
56 | 64 | ||
57 | # Allow overriding this separately | 65 | # Allow overriding this separately |
58 | OEPATCHES = "\ | 66 | OEPATCHES = "\ |