diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-11-03 19:03:49 +0200 |
|---|---|---|
| committer | Andrew Jeffery <andrew@aj.id.au> | 2016-01-27 10:39:34 +1030 |
| commit | ca7c3f6a0c395160fa101dabd64a576bbc06f65f (patch) | |
| tree | a562baadd0d0aebd5800088fc29390b5bc494d7a /yocto-poky/meta/recipes-devtools | |
| parent | 9ff7333d1b8414f446e76f865feb6c3fc81c6ee4 (diff) | |
| download | talos-openbmc-ca7c3f6a0c395160fa101dabd64a576bbc06f65f.tar.gz talos-openbmc-ca7c3f6a0c395160fa101dabd64a576bbc06f65f.zip | |
qemu-native: fix build on Ubuntu 15.10
Build of qemu-native on Ubuntu 15.10 fails on configure step.
The reason for this is that system dbus version is higher than
oe dbus version and system pulseaudio libraries require newer dbus.
It causes configure to break with a lot of errors similar to this:
libpulsecommon-6.0.so: undefined reference to dbus_watch_get_enabled@LIBDBUS_1_3
Fixed by building qemu-native with the system dbus on Ubuntu 15.10
Note: This is a workaround. It must be removed when oe dbus is upgraded
to the version >= system dbus version (1.10.0 at the moment).
[YOCTO #8553]
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'yocto-poky/meta/recipes-devtools')
| -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 } |
