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].

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 076e8ad92942a3510f9cb95dc609844416304699..611ee61bebdeedcafee90b9f44d1f4b76a607373 100644 (file)
--- 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
 }