From fbe129100bbc4ac542fcc304f07a73196bf83628 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Thu, 3 Jul 2014 15:57:32 +0300 Subject: qemu: fix qemu-native pkg-config paths For qemu-native, the pkg-config paths do not include build host paths. This is an issue for libsdl for example, where SDL is used by qemu, but for qemu-native libsdl-native is not built, but assumed to be provided by the build host. Because pkg-config do not search for libsdl config files on the build host sysroot, the configure stage of qemu-native will fail because it will not find SDL as being installed. Usually, the isssue is masked by a functional sdl-config that will be interogated instead of pkg-config. However, on Build Appliance, sdl-config is deliberately made non-functional, so the issue manifests itself. The fix will create an extended PKG_CONFIG_PATH, which does include the build host sysroot paths for pkg-config. Fix for [YOCTO #6495]. (From OE-Core rev: 68a5ed337f8f7ee8e5bf55542ec82d786eb754db) Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta') diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 076e8ad929..611ee61beb 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -33,6 +33,10 @@ EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disa export LIBTOOL="${HOST_SYS}-libtool" do_configure_prepend_class-native() { + # Append build host pkg-config paths for native target since the host may provide sdl + BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config) + export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH + # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed sed -i 's/-lX11//g' Makefile.target } -- cgit v1.2.3-54-g00ecf