From 81d7adf6059f0b501b1db6eb28dc9543f03c09ed Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 30 Jul 2014 14:42:34 +0100 Subject: 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. (From OE-Core rev: c39a1172afd783cedf4cb11f00e8f16d7a7ec22c) Signed-off-by: Richard Purdie Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/qemu') diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 3cb85363ca..84330aecb0 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 -- cgit v1.2.3-54-g00ecf