diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-12-07 23:14:06 +0100 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-12-07 23:43:03 +0100 |
| commit | 7d81c37c6b57d051fbcdb866dcf2b7376aa3ab66 (patch) | |
| tree | d0debc56d985f8ea2b9573579beed01299954444 | |
| parent | ff47d6aa0acdf041f5caa44aefe009900ce36511 (diff) | |
| download | meta-java-7d81c37c6b57d051fbcdb866dcf2b7376aa3ab66.tar.gz | |
openjdk7: disable shark until it is working again
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 5917f73..b470ded 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
| @@ -89,9 +89,10 @@ export CACAO_CONFIGURE_ARGS = " \ | |||
| 89 | 89 | ||
| 90 | JAVA_HOME[unexport] = "1" | 90 | JAVA_HOME[unexport] = "1" |
| 91 | 91 | ||
| 92 | WITH_ADDITIONAL_VMS ?= "--with-additional-vms=shark,cacao,jamvm" | 92 | # disable shark until it is fully working again |
| 93 | # WITH_ADDITIONAL_VMS ?= "--with-additional-vms=shark,cacao,jamvm" | ||
| 93 | 94 | ||
| 94 | WITH_ADDITIONAL_VMS_arm = "--with-additional-vms=cacao,jamvm" | 95 | WITH_ADDITIONAL_VMS ?= "--with-additional-vms=cacao,jamvm" |
| 95 | 96 | ||
| 96 | # OpenJDK supports parallel compilation but uses a plain number for this. | 97 | # OpenJDK supports parallel compilation but uses a plain number for this. |
| 97 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | 98 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, |