summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2014-06-12 15:32:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 12:54:39 +0100
commit0eeeb40d2af99448c3b94047f26d33a9983a221b (patch)
treeedcf3de11c436648e100caadea410571cadac497
parent8b66eccc05a62f1e2267c1bdf1086d8328bb962c (diff)
downloadopenembedded-core-contrib-0eeeb40d2af99448c3b94047f26d33a9983a221b.tar.gz
openembedded-core-contrib-0eeeb40d2af99448c3b94047f26d33a9983a221b.tar.bz2
openembedded-core-contrib-0eeeb40d2af99448c3b94047f26d33a9983a221b.zip
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. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus.inc3
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 \
--disable-xml-docs \
--disable-doxygen-docs \
--disable-libaudit \
- --disable-systemd"
+ --disable-systemd \
+ --without-dbus-glib"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"