summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-26 21:25:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-27 16:04:52 +0100
commitd35d19b6d0844daf8ca8aa059c0aa6077c2f573a (patch)
treec614f4c5cb3316929e5219fd58b561de6b90c2c7
parent0fbb2e0c1889ee34d7f96266615e891bb44b1d10 (diff)
downloadopenembedded-core-d35d19b6d0844daf8ca8aa059c0aa6077c2f573a.tar.gz
openembedded-core-d35d19b6d0844daf8ca8aa059c0aa6077c2f573a.tar.bz2
openembedded-core-d35d19b6d0844daf8ca8aa059c0aa6077c2f573a.zip
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@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5c99e11b3c..550eb0ab3b 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 \