diff options
author | Sven Ebenfeld <sven.ebenfeld@gmail.com> | 2015-04-27 22:13:00 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-04-28 16:09:34 -0300 |
commit | cf74220c5f9902e77845a21fce909c9e96f4da8e (patch) | |
tree | cc916ab8c07b903f6c9ba7d7620228c52ca22a2e /recipes-core/openjdk | |
parent | 31460be0ffad5fea3d41e50fba3eccce7993e409 (diff) | |
download | meta-java-cf74220c5f9902e77845a21fce909c9e96f4da8e.tar.gz |
openjdk-7: use icedtea7-native as dependency instead of icedtea6
Due to problems when using native rmic, I switched to using icedtea7.
Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index b9ec571..29519fa 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -26,7 +26,7 @@ PN = "${JDKPN}-jre" | |||
26 | PROVIDES += "${JDKPN}" | 26 | PROVIDES += "${JDKPN}" |
27 | 27 | ||
28 | DEPENDS = " \ | 28 | DEPENDS = " \ |
29 | icedtea6-native zip-native ant-native \ | 29 | icedtea7-native zip-native ant-native \ |
30 | zlib \ | 30 | zlib \ |
31 | jpeg libpng giflib \ | 31 | jpeg libpng giflib \ |
32 | gtk+ glib-2.0 \ | 32 | gtk+ glib-2.0 \ |
@@ -101,7 +101,7 @@ EXTRA_OECONF = " \ | |||
101 | \ | 101 | \ |
102 | --enable-zero \ | 102 | --enable-zero \ |
103 | \ | 103 | \ |
104 | --with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native \ | 104 | --with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea7-native \ |
105 | --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \ | 105 | --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \ |
106 | \ | 106 | \ |
107 | --with-openjdk-src-zip=${WORKDIR}/${OPENJDK_FILE} \ | 107 | --with-openjdk-src-zip=${WORKDIR}/${OPENJDK_FILE} \ |