diff options
| author | nkskjames <nkskjames@gmail.com> | 2016-01-28 12:14:22 +0800 |
|---|---|---|
| committer | nkskjames <nkskjames@gmail.com> | 2016-01-28 12:14:22 +0800 |
| commit | 12aaa75468b4cf08370d57f870f9d2ab0b9b7847 (patch) | |
| tree | 45b2d8280948d540047e17a096ba1ca595081eec /yocto-poky | |
| parent | 1f0e673e5ff8347401c3d3622b843a33b8aca2c1 (diff) | |
| parent | ca7c3f6a0c395160fa101dabd64a576bbc06f65f (diff) | |
| download | talos-openbmc-12aaa75468b4cf08370d57f870f9d2ab0b9b7847.tar.gz talos-openbmc-12aaa75468b4cf08370d57f870f9d2ab0b9b7847.zip | |
Merge pull request #146 from amboar/wily-dbus-fix
qemu-native: fix build on Ubuntu 15.10
Diffstat (limited to 'yocto-poky')
| -rw-r--r-- | yocto-poky/meta/recipes-devtools/qemu/qemu.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-devtools/qemu/qemu.inc b/yocto-poky/meta/recipes-devtools/qemu/qemu.inc index 738bf2b22..f6c0ae304 100644 --- a/yocto-poky/meta/recipes-devtools/qemu/qemu.inc +++ b/yocto-poky/meta/recipes-devtools/qemu/qemu.inc @@ -43,6 +43,12 @@ do_configure_prepend_class-native() { 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 + # link with system dbus on Ubuntu 15.10 + # FIXME: remove below 4 lines when oe dbus is upgraded + if [ -r /etc/lsb-release -a "$(lsb_release -is)$(lsb_release -rs)" = "Ubuntu15.10" ] ; then + libs=$(PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_PATH=$BHOST_PKGCONFIG_PATH PATH=/usr/bin:/bin pkg-config --libs dbus-1 || echo "") + [ -n "$libs" ] && export LDFLAGS="$libs $LDFLAGS" + fi fi } |
