From 70056359c27144bd461e7d37636e2629f9933e1e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Jul 2012 05:18:54 +0000 Subject: openjdk-6-common: Pass LD_LIBRARY_PATH to app running under qemu When target and build host are same eg. x86_64 and qemux86-64 then application uses the dynamic linker from OEs sysroot but libc from the build host and they may have different versions and end up in unpleasant results. We therefore make sure that libc is also used from OEs sysroot Signed-off-by: Khem Raj Signed-off-by: Henning Heinold --- recipes-core/openjdk/openjdk-6-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index d81543c..c1861b6 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 = "r17" +INC_PR = "r18" SRC_URI = "\ ${ICEDTEA_URI} \ @@ -242,7 +242,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_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" +QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET} -E LD_LIBRARY_PATH=${STAGING_BASELIBDIR}" EXTRA_OEMAKE += 'QEMU="${QEMU}"' -- cgit v1.2.3-54-g00ecf