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

[Denys Dmytriyenko]

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=6eea2e0c7750dd8e620dcb1437312fa5"
> -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?

-- 
Denys


>  
> @@ -22,7 +23,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
>  
>  DEBIANNAME_${PN} = "dbus-1"
>  
> -PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd"
> +PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
>  
>  FILES_${PN}-x11 = "${bindir}/dbus-launch"
>  RDEPENDS_${PN}-x11 = "${PN}"
> @@ -73,7 +74,7 @@ pkg_postinst_dbus() {
>  	fi
>  }
>  
> -EXTRA_OECONF_X = "--with-x"
> +EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
>  EXTRA_OECONF_X_virtclass-native = "--without-x"
>  
>  EXTRA_OECONF = "--disable-tests \
> -- 
> 1.7.4.1
> 
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core