diff options
| author |   Xerxes Rånby <xerxes@zafena.se> | 2010-07-26 13:30:04 +0200 |
|---|---|---|
| committer | Xerxes Rånby <xerxes@zafena.se> | 2010-07-26 14:36:20 +0200 |
| commit | 929ace60623cbb1552f05744c83a29d45545554b (patch) | |
| tree | b181236925c5f0e9cb67d1470a27639c8458da03 /recipes/openjdk | |
| parent | 76da91238b48fb7667b145b2520bf53891bcf9ca (diff) | |
| download | openembedded-929ace60623cbb1552f05744c83a29d45545554b.tar.gz | |
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.
Diffstat (limited to 'recipes/openjdk')
| -rw-r--r-- | recipes/openjdk/openjdk-6-common.inc | 4 |
1 files changed, 3 insertions, 1 deletions
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" |