From 0187fd6617cca8e8e46e080df4591e113328913c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 13 Feb 2012 17:43:25 +0000 Subject: openjdk: fix qemu target detection Signed-off-by: Otavio Salvador --- recipes-core/openjdk/openjdk-6-common.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-core/openjdk/openjdk-6-common.inc') diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index b4ea9ab..bdc97d8 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc @@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r13" +INC_PR = "r14" SRC_URI = "\ ${ICEDTEA_URI} \ @@ -48,7 +48,7 @@ DEPENDS_append_libc-uclibc = " libiconv " # that generates constants for an assembler source file. There is no other # way than to generate this on a pseudo machine. Cross-compiling would not help # because structure sizes and/or alignment may differ. -DEPENDS_append_arm = " qemu-native " +DEPENDS_append = " qemu-native " # No package should directly depend on this (it should require @@ -68,7 +68,7 @@ PRIVATE_LIBS = "\ " -inherit java autotools gettext +inherit java autotools gettext qemu export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" @@ -250,7 +250,7 @@ EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' # Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "qemu-${TARGET_ARCH} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" +QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" EXTRA_OEMAKE += 'QEMU="${QEMU}"' -- cgit v1.2.3-54-g00ecf