From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 7 May 2020 06:22:21 +0000 (-0700)
Subject: avahi: Cover gtk packageconfig with x11/wayland distro features
X-Git-Tag: uninative-2.9~871
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d3f6ffb148e8837f2f6ba81f07dbfd6bbec64726;p=openembedded-core.git

avahi: Cover gtk packageconfig with x11/wayland distro features

This ensures that avahi can compile for EGLFS distros (headless)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index f4924fa1cb..3a2c24f9f8 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -35,7 +35,7 @@ DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
 # For gtk related PACKAGECONFIGs: gtk, gtk3
 AVAHI_GTK ?= "gtk3"
 
-PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
+PACKAGECONFIG ??= "dbus ${@bb.utils.contains_any('DISTRO_FEATURES','x11 wayland','${AVAHI_GTK}','',d)}"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
 PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"