[OE-core] [PATCH 2/4] dbus: Drop libx11 dependency when building without 'x11' distro feature

[Richard Purdie]

On Sat, 2013-02-16 at 19:20 -0200, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  meta/recipes-core/dbus/dbus.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
> index 292ab29..cebab28 100644
> --- a/meta/recipes-core/dbus/dbus.inc
> +++ b/meta/recipes-core/dbus/dbus.inc
> @@ -8,7 +8,7 @@ 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 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
>  RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest', '', d)}"
>  RDEPENDS_class-native = ""

This tends to be a really bad idea for dbus-nativesdk. If you install an
SDK compiled with these options into PATH only a system which does have
x11, it will break functionality in a way unacceptable to users.

I'm not sure we should ever ship dbus-launch with the SDK so perhaps we
should just delete it like we now do for the -native version, then we
could drop the x11 requirement in all cases.

Cheers,

Richard