[oe-commits] Ross Burton : dbus: disable all X11 when native

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d35d19b6d0844daf8ca8aa059c0aa6077c2f573a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d35d19b6d0844daf8ca8aa059c0aa6077c2f573a

Author: Ross Burton <ross.burton at intel.com>
Date:   Wed Sep 26 21:25:19 2012 +0100

dbus: disable all X11 when native

Without --without-x the X11 detection would still go ahead and find the host X11
headers, which seems to cause problems at link time.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/dbus/dbus.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5c99e11..550eb0a 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
 DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
 DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://tmpdir.patch; \
@@ -64,7 +64,7 @@ pkg_postinst_dbus() {
 }
 
 EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
+EXTRA_OECONF_X_virtclass-native = "--without-x --disable-x11-autolaunch"
 
 EXTRA_OECONF = "--disable-tests \
                 --disable-checks \