diff options
author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2014-06-12 15:32:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-13 12:54:41 +0100 |
commit | b46262156ac2232759e1aa61dc931440b0b12816 (patch) | |
tree | d21e3cb7f994e063f81067e18f5fbaf6d926b205 /meta | |
parent | 9713dcc717c519711b2be3844afc15b2ebb0b10e (diff) | |
download | poky-b46262156ac2232759e1aa61dc931440b0b12816.tar.gz |
dbus: disable usage of dbus-glib explicitly
on rebuilds, dbus-native can detect an already existing dbus-glib and
tries to link some tests against it. As files were unstaged and due
to libtool insanities this fails with:
| /usr/bin/grep: .../sysroots/x86_64-oe-linux/usr/lib/libdbus-1.la: No such file or directory
| sed: can't read .../sysroots/x86_64-oe-linux/usr/lib/libdbus-1.la: No such file or directory
| x86_64-oe-linux-libtool: link: `.../sysroots/x86_64-oe-linux/usr/lib/libdbus-1.la' is not a valid libtool archive
| make[3]: *** [libdbus-testutils.la] Error 1
| make[3]: Leaving directory `.../work/x86_64-oe-linux/dbus-native/1.8.2-r0/build/test'
Make builds predicatable (and working) by disabling usage of dbus-glib
explicitly.
(From OE-Core rev: 0eeeb40d2af99448c3b94047f26d33a9983a221b)
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index b3d3834dd0..be0131c3d8 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -83,7 +83,8 @@ EXTRA_OECONF = "--disable-tests \ | |||
83 | --disable-xml-docs \ | 83 | --disable-xml-docs \ |
84 | --disable-doxygen-docs \ | 84 | --disable-doxygen-docs \ |
85 | --disable-libaudit \ | 85 | --disable-libaudit \ |
86 | --disable-systemd" | 86 | --disable-systemd \ |
87 | --without-dbus-glib" | ||
87 | 88 | ||
88 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 89 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
89 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 90 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |