summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-30 14:42:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:26:15 +0100
commit81d7adf6059f0b501b1db6eb28dc9543f03c09ed (patch)
treeb2434f7043181df95a4158ce3c0a0156609c9eef /meta
parent1fb8fdbba81f20e9370cdc0af0f31da44433572d (diff)
downloadpoky-81d7adf6059f0b501b1db6eb28dc9543f03c09ed.tar.gz
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 <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc6
1 files changed, 4 insertions, 2 deletions
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"
35 35
36do_configure_prepend_class-native() { 36do_configure_prepend_class-native() {
37 # Append build host pkg-config paths for native target since the host may provide sdl 37 # Append build host pkg-config paths for native target since the host may provide sdl
38 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config) 38 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
39 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH 39 if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
40 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
41 fi
40 42
41 # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed 43 # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
42 sed -i 's/-lX11//g' Makefile.target 44 sed -i 's/-lX11//g' Makefile.target