[OE-core] dbus: only use x11 if DISTRO_FEATURES has selected it

[Paul Eggleton]

On Thursday 25 October 2012 00:08:26 Denys Dmytriyenko wrote:
> On Fri, Aug 12, 2011 at 04:59:43PM +0100, Phil Blundell wrote:
> > This makes it possible to include dbus in a non-X11-equipped DISTRO.
> 
> I have a follow up question on this old change...
> 
> > Signed-off-by: Phil Blundell <philb at gnu.org>
> > ---
> > 
> >  meta/recipes-core/dbus/dbus.inc |    7 ++++---
> >  1 files changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta/recipes-core/dbus/dbus.inc
> > b/meta/recipes-core/dbus/dbus.inc index 6b76cba..a8ecda8 100644
> > --- a/meta/recipes-core/dbus/dbus.inc
> > +++ b/meta/recipes-core/dbus/dbus.inc
> > @@ -5,7 +5,8 @@ SECTION = "base"
> > 
> >  LICENSE = "AFL-2 | GPLv2+"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
> >  
> >                      file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0
> >                      c7750dd8e620dcb1437312fa5"> 
> > -DEPENDS = "expat virtual/libintl virtual/libx11 libsm"
> > +X11DEPENDS = "virtual/libx11 libsm"
> > +DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES',
> > 'x11', '${X11DEPENDS}', '', d)}"> 
> >  DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
> >  DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk
> >  virtual/libx11"
>
> Would there be any objections extending this DISTRO check to nativesdk as
> well?

We did have a request not so long ago to be able to have x11 enabled in the 
nativesdk (for development tools that need X) but disabled on the target. I'm 
pretty sure we already have a lot of places where DISTRO_FEATURES will 
influence nativesdk, but I suspect the configuration may need to be separated 
for these two at some point.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre