diff options
author | Henning Heinold <henning@itconsulting-heinold.de> | 2013-03-31 21:54:30 +0000 |
---|---|---|
committer | Henning Heinold <henning@itconsulting-heinold.de> | 2014-01-09 01:26:02 +0100 |
commit | 76c497ed3b21832b7561e872c14fe072065bd24d (patch) | |
tree | 475eaf5cfac28320afb8c935bfd6a754dbbee668 | |
parent | ff21c25720a75ac8740ea7a795ebf0c849f42522 (diff) | |
download | meta-java-76c497ed3b21832b7561e872c14fe072065bd24d.tar.gz |
openjdk7: use icedtea6-native instead of icedtea7-native
* the current icedtea7 seems to have some issues when compiling
on recent linux distribution
* switch back to icedtea6-native to have a reliable state
for building openjdk7
-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 206bf12..9ecc990 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 | icedtea7-native zip-native ant-native \ | 29 | icedtea6-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}/icedtea7-native \ | 104 | --with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-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} \ |