Patchwork [meta-java] openjdk-7: use icetea6-native

login
register
mail settings
Submitter Koen Kooi
Date Jan. 16, 2014, 4:23 p.m.
Message ID <1389889389-6514-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/64983/
State New, archived
Headers show

Comments

Koen Kooi - Jan. 16, 2014, 4:23 p.m.
Since icetea6-native fails to build on all my machines and icedtea7-native works, switch to that.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 recipes-core/openjdk/openjdk-7-common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Henning Heinold - Jan. 16, 2014, 4:42 p.m.
On Thu, Jan 16, 2014 at 05:23:09PM +0100, Koen Kooi wrote:
> Since icetea6-native fails to build on all my machines and icedtea7-native works, switch to that.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  recipes-core/openjdk/openjdk-7-common.inc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
> index 9ecc990..206bf12 100644
> --- a/recipes-core/openjdk/openjdk-7-common.inc
> +++ b/recipes-core/openjdk/openjdk-7-common.inc
> @@ -26,7 +26,7 @@ PN = "${JDKPN}-jre"
>  PROVIDES += "${JDKPN}"
>  
>  DEPENDS = " \
> -           icedtea6-native zip-native ant-native \
> +           icedtea7-native zip-native ant-native \
>             zlib \
>  	   jpeg libpng giflib \
>             gtk+ glib-2.0 \
> @@ -101,7 +101,7 @@ EXTRA_OECONF = " \
>  	\
>          --enable-zero \
>  	\
> -	--with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native \
> +	--with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea7-native \
>  	--with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \
>  	\
>          --with-openjdk-src-zip=${WORKDIR}/${OPENJDK_FILE} \
> -- 
> 1.8.4.2
> 

Hi Koen,

others report that icedtea7-native does not compile for them. So I need to find another solution. In long term icedtea-native and openjdk
recipes will be merged, but I have enough work for 3 lives.

Bye Henning

Patch

diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 9ecc990..206bf12 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -26,7 +26,7 @@  PN = "${JDKPN}-jre"
 PROVIDES += "${JDKPN}"
 
 DEPENDS = " \
-           icedtea6-native zip-native ant-native \
+           icedtea7-native zip-native ant-native \
            zlib \
 	   jpeg libpng giflib \
            gtk+ glib-2.0 \
@@ -101,7 +101,7 @@  EXTRA_OECONF = " \
 	\
         --enable-zero \
 	\
-	--with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native \
+	--with-jdk-home=${STAGING_LIBDIR_JVM_NATIVE}/icedtea7-native \
 	--with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \
 	\
         --with-openjdk-src-zip=${WORKDIR}/${OPENJDK_FILE} \