From: Xerxes Rånby <xerxes@zafena.se>
Date: Mon, 26 Jul 2010 11:30:04 +0000 (+0200)
Subject: openjdk-6-6b18: Fix cacao on soft-float systems.
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929ace60623cbb1552f05744c83a29d45545554b;p=openembedded.git

openjdk-6-6b18: Fix cacao on soft-float systems.

	* openjdk-6-common.inc: Configure cacao with --enable-softfloat
	on systems that are not equipped with a FPU.
	This fixes openjdk + cacao on ARMv4 and ARMv5 systems.
	Bumped PR.
---

diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc
index 3c81520056..8da940f181 100644
--- a/recipes/openjdk/openjdk-6-common.inc
+++ b/recipes/openjdk/openjdk-6-common.inc
@@ -72,7 +72,9 @@ inherit java autotools
 export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
 export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
 export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
-export CACAO_CONFIGURE_ARGS = "--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-openjdk-0.99.4"
+export CACAO_CONFIGURE_ARGS = "\
+	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
+	--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-openjdk-0.99.4"
 
 JAVA_HOME[unexport] = "1"