summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-07-03 15:57:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-03 17:41:16 +0100
commitfbe129100bbc4ac542fcc304f07a73196bf83628 (patch)
tree2fca316a460b3b0bd6f5558fc232b4a9e9035a39 /meta/recipes-devtools
parent5aec84dc659684f5712d1889ffa5033718ed8bc7 (diff)
downloadpoky-fbe129100bbc4ac542fcc304f07a73196bf83628.tar.gz
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 <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc4
1 files changed, 4 insertions, 0 deletions
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
33export LIBTOOL="${HOST_SYS}-libtool" 33export LIBTOOL="${HOST_SYS}-libtool"
34 34
35do_configure_prepend_class-native() { 35do_configure_prepend_class-native() {
36 # Append build host pkg-config paths for native target since the host may provide sdl
37 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config)
38 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
39
36 # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed 40 # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
37 sed -i 's/-lX11//g' Makefile.target 41 sed -i 's/-lX11//g' Makefile.target
38} 42}