summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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:05:09 +0100
commit30b0c3c6f4b17109377205bfd90de9231ca83be1 (patch)
tree8c7f93075975ddd542843049ae892d5de66ce2a3 /meta/recipes-core
parent8bb52d817a4610395a57339fc87ecb849cf24920 (diff)
downloadpoky-30b0c3c6f4b17109377205bfd90de9231ca83be1.tar.gz
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. (From OE-Core rev: d35d19b6d0844daf8ca8aa059c0aa6077c2f573a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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
10DEPENDS_virtclass-native = "expat-native virtual/libintl-native" 10DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
11DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" 11DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11"
12 12
13INC_PR = "r4" 13INC_PR = "r5"
14 14
15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
16 file://tmpdir.patch; \ 16 file://tmpdir.patch; \
@@ -64,7 +64,7 @@ pkg_postinst_dbus() {
64} 64}
65 65
66EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" 66EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
67EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch" 67EXTRA_OECONF_X_virtclass-native = "--without-x --disable-x11-autolaunch"
68 68
69EXTRA_OECONF = "--disable-tests \ 69EXTRA_OECONF = "--disable-tests \
70 --disable-checks \ 70 --disable-checks \