diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2015-01-20 16:14:24 +0100 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-01-25 16:55:03 -0200 |
| commit | e705d5e697d20c6811b9687313b027f66a17a42e (patch) | |
| tree | bd61301cf80cfee1a026c91795df34962f69d542 /recipes-core/openjdk/openjdk-common.inc | |
| parent | cb351db824b0eb4a71514156bba543f6dde19740 (diff) | |
| download | meta-java-e705d5e697d20c6811b9687313b027f66a17a42e.tar.gz | |
Revert "openjdk: Fix QEMU call to use sysroot for libs"
This reverts commit ab51e51d9a9a51bedd19de09bcba4ce830dfc5e7.
Using an oe setup with ptest enabled makes qemu never to return due to testfiles
staged by udev in the sysroot
See also:
http://lists.openembedded.org/pipermail/openembedded-core/2014-September/097098.html
All binaries compiled for qemu are now linked with -static. The -L, -E parameters
pointing to the sysroot and dynamic linker are not needed anymore and removel works
around the issue.
Further details:
http://lists.openembedded.org/pipermail/openembedded-devel/2015-January/099795.html
Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-common.inc')
| -rw-r--r-- | recipes-core/openjdk/openjdk-common.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index 97947b5..349ce9e 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc | |||
| @@ -72,6 +72,6 @@ export WANT_LLVM_RELEASE = "2.8" | |||
| 72 | export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}" | 72 | export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}" |
| 73 | 73 | ||
| 74 | # Large stack is required at least on x86_64 host, otherwise random segfaults appear: | 74 | # Large stack is required at least on x86_64 host, otherwise random segfaults appear: |
| 75 | QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152 -L ${STAGING_DIR_TARGET} -E LD_LIBRARY_PATH=${STAGING_BASELIBDIR}" | 75 | QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152" |
| 76 | 76 | ||
| 77 | EXTRA_OEMAKE += 'QEMU="${QEMU}"' | 77 | EXTRA_OEMAKE += 'QEMU="${QEMU}"' |