From 2dcb6bf9205a5b2144ccb7f2912bf3e13211ae88 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 17 Feb 2013 17:53:09 +0000 Subject: dbus: Drop x11 support from nativesdk This avoid a libx11 dependency for nativesdk as it is not intended to be run in the toolchain. We also remove the dbus-launch as without x11 support it might case trouble for user Signed-off-by: Otavio Salvador Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/dbus') diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 292ab296bc..4897fd3e57 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ X11DEPENDS = "virtual/libx11 libsm" DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" DEPENDS_class-native = "expat-native virtual/libintl-native" -DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" +DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl" RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}" RDEPENDS_class-native = "" -INC_PR = "r5" +INC_PR = "r6" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ @@ -126,5 +126,9 @@ do_install_class-native() { do_install_class-nativesdk() { autotools_do_install + + # dbus-launch has no X support so lets not install it in case the host + # has a more featured and useful version + rm -f ${D}${bindir}/dbus-launch } BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg