[oe-commits] Richard Purdie : qemu.inc: Allow optional use of pkg-config from the HOST

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c39a1172afd783cedf4cb11f00e8f16d7a7ec22c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c39a1172afd783cedf4cb11f00e8f16d7a7ec22c

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Jul 30 14:42:34 2014 +0100

qemu.inc: Allow optional use of pkg-config from the HOST

Currently, if pkg-config isn't installed on the build system, this code
can cause an error. We don't need to require this, only use it if its
present so allow the test to fail gracefully.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-devtools/qemu/qemu.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 3cb8536..84330ae 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -35,8 +35,10 @@ 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
+	BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
+	if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
+		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
+	fi
 
 	# Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
 	sed -i 's/-lX11//g' Makefile.target