diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-30 14:42:34 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-02 09:25:33 +0100 |
| commit | c39a1172afd783cedf4cb11f00e8f16d7a7ec22c (patch) | |
| tree | b1ae166da767dfc9e7d6a83d6f68ee125a779bc0 /meta/recipes-devtools/qemu | |
| parent | 8b55dd80a54e9a8e10e9e689ad40fac8d0130ba7 (diff) | |
| download | openembedded-core-contrib-c39a1172afd783cedf4cb11f00e8f16d7a7ec22c.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/qemu')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 6 |
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" 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 |