diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-07-20 05:18:54 +0000 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-07-21 11:37:10 +0200 |
commit | 70056359c27144bd461e7d37636e2629f9933e1e (patch) | |
tree | ea6b22b1c0aac30d7316ff7caa08a8e18817bf90 | |
parent | fe411d359c6cec91218b8d7adffc23490656b152 (diff) | |
download | meta-java-70056359c27144bd461e7d37636e2629f9933e1e.tar.gz |
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 <raj.khem@gmail.com>
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
-rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 4 |
1 files 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" | |||
10 | S = "${WORKDIR}/${ICEDTEA}" | 10 | S = "${WORKDIR}/${ICEDTEA}" |
11 | B = "${S}/build" | 11 | B = "${S}/build" |
12 | 12 | ||
13 | INC_PR = "r17" | 13 | INC_PR = "r18" |
14 | 14 | ||
15 | SRC_URI = "\ | 15 | SRC_URI = "\ |
16 | ${ICEDTEA_URI} \ | 16 | ${ICEDTEA_URI} \ |
@@ -242,7 +242,7 @@ EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' | |||
242 | 242 | ||
243 | 243 | ||
244 | # Large stack is required at least on x86_64 host, otherwise random segfaults appear: | 244 | # Large stack is required at least on x86_64 host, otherwise random segfaults appear: |
245 | QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" | 245 | QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET} -E LD_LIBRARY_PATH=${STAGING_BASELIBDIR}" |
246 | 246 | ||
247 | EXTRA_OEMAKE += 'QEMU="${QEMU}"' | 247 | EXTRA_OEMAKE += 'QEMU="${QEMU}"' |
248 | 248 | ||