From 6c01d9fa201b5578d64650c0fdab1c13a82a0c42 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 1 Mar 2014 21:40:46 +0100 Subject: openjdk-common.inc: fix qemu usage * compile all binaries, which are executed by qemu, with the static compilerflag, because of a memleak inside qemu * remove lib- and ld-path for qemu usage, because all binaries are compiled static now, openjdk7 seems to compile fine anyway --- recipes-core/openjdk/openjdk-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-core/openjdk/openjdk-common.inc') diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index a993ea0..9c746de 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" export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}" # Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152 -L ${STAGING_DIR_TARGET} -E LD_LIBRARY_PATH=${STAGING_BASELIBDIR}" +QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152" EXTRA_OEMAKE += 'QEMU="${QEMU}"' -- cgit v1.2.3-54-g00ecf From 49b063c7986e1ae1411f278af53f49f1e77349f7 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 10 Oct 2014 15:00:28 +0300 Subject: openjdk: add pkgconfig support pkgconfig is now enabled, so that pkg-config macros will not fail in configure stage. Signed-off-by: Cristian Iorga --- recipes-core/openjdk/openjdk-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-core/openjdk/openjdk-common.inc') diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index 9c746de..349ce9e 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc @@ -17,7 +17,7 @@ DEPENDS_append_libc-uclibc = " virtual/libiconv " # because structure sizes and/or alignment may differ. DEPENDS_append = " qemu-native " -inherit java autotools gettext qemu +inherit java autotools gettext qemu pkgconfig # OpenJDK uses slightly different names for certain arches. We need to know # this to create some files which are expected by the build. -- cgit v1.2.3-54-g00ecf