diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-01-25 10:00:15 +0100 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-01-25 11:16:41 +0100 |
| commit | ab398b7c9cbcc5ba2824ac55e10bd16ce971adf9 (patch) | |
| tree | 676e235b8f469caafc7ad955a97d1648b13f42a0 | |
| parent | d0eeda3107951433db2b6d4ed602573ae52e166e (diff) | |
| download | meta-java-ab398b7c9cbcc5ba2824ac55e10bd16ce971adf9.tar.gz | |
openjdk: remove llvm as dependency until we can shark enable again
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 2 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index c21711f..99f0aa9 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc | |||
| @@ -34,7 +34,7 @@ PROVIDES += "${JDKPN} ${PACKAGES}" | |||
| 34 | DEPENDS = "giflib libpng jpeg cups \ | 34 | DEPENDS = "giflib libpng jpeg cups \ |
| 35 | rhino \ | 35 | rhino \ |
| 36 | freetype libxinerama libxt libxrender libxtst libxi \ | 36 | freetype libxinerama libxt libxrender libxtst libxi \ |
| 37 | alsa-lib libffi llvm2.8 \ | 37 | alsa-lib libffi \ |
| 38 | ant-native \ | 38 | ant-native \ |
| 39 | fastjar-native \ | 39 | fastjar-native \ |
| 40 | icedtea6-native \ | 40 | icedtea6-native \ |
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index c58a436..3246814 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
| @@ -42,17 +42,7 @@ DEPENDS = " \ | |||
| 42 | cups fontconfig \ | 42 | cups fontconfig \ |
| 43 | rhino \ | 43 | rhino \ |
| 44 | libxt libxinerama libxrender libxtst libxi \ | 44 | libxt libxinerama libxrender libxtst libxi \ |
| 45 | freetype alsa-lib libffi llvm2.8 \ | 45 | freetype alsa-lib libffi \ |
| 46 | " | ||
| 47 | DEPENDS_arm = " \ | ||
| 48 | icedtea7-native zip-native ant-native \ | ||
| 49 | zlib \ | ||
| 50 | jpeg libpng giflib \ | ||
| 51 | gtk+ glib-2.0 \ | ||
| 52 | cups fontconfig \ | ||
| 53 | rhino \ | ||
| 54 | libxt libxinerama libxrender libxtst libxi \ | ||
| 55 | freetype alsa-lib libffi \ | ||
| 56 | " | 46 | " |
| 57 | 47 | ||
| 58 | DEPENDS_append_libc-uclibc = " virtual/libiconv " | 48 | DEPENDS_append_libc-uclibc = " virtual/libiconv " |