Skip to contentSkip to conversation

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

PATCH New Richard Purdie 1 participant 1 message Jul 30, 2014

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
meta/recipes-devtools/qemu/qemu.inc +4 -2
index 3cb8536..ddf40f7 100644
@@ -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