Skip to contentSkip to conversation

Partial fix for YB6495

PATCH New Cristian Iorga 1 participant 2 messages Jul 3, 2014

lore
Share & tools
lore
#0 lore raw

cover Partial fix for YB6495

For YB6495 to be completely fixed, source poky commit for Build Appliance needs to be advanced to this patch after integration.
As such, this is a partial fix.

The following changes since commit 0ed5a13f5f9478e2c22f517fb3504b738422f85c:

python3: fix builtins imports (2014-06-30 16:36:44 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ciorga/YB6495
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/YB6495

Cristian Iorga (1):
qemu: fix qemu-native pkg-config paths

 meta/recipes-devtools/qemu/qemu.inc | 4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 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 [YP #6495].

---
 meta/recipes-devtools/qemu/qemu.inc | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +4 -0
index 076e8ad..449b5f4 100644
@@ -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
+        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
 }
Signature · 1 line
1.9.1