avahi: avoid depending on skipped package

Submitted by Jens Rehsack on Nov. 28, 2018, 8:15 a.m. | Patch ID: 156690

Details

Message ID 20181128081530.31125-1-sno@netbsd.org
State Accepted
Commit 319532792435be73e96c8319e90336e1298ac2a1
Headers show

Commit Message

Jens Rehsack Nov. 28, 2018, 8:15 a.m.
When built without D-Bus, libavahi-client is not build:
  Building libavahi-client:           no   (You need avahi-daemon and D-Bus!)
which causes avahi-dev RDEPENDS failing when creating an image
containing development-tools:
 *   - nothing provides libavahi-client = 0.7-r0 needed by avahi-dev-0.7-r0.cortexa8hf-neon

Signed-off-by: Jens Rehsack <sno@netbsd.org>
---
 meta/recipes-connectivity/avahi/avahi_0.7.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb
index 3d5f334a88..2e04d304c7 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
@@ -38,7 +38,8 @@  FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*  ${libdir}/girepository-1.0/Avahi*.typelib"
 FILES_avahi-utils = "${bindir}/avahi-*"
 
-RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})"
+RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV})"
+RDEPENDS_${PN}-dev += "${@["", " libavahi-client (= ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
 
 RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns"
 

Comments

Ross Burton Nov. 28, 2018, 11:20 a.m.
Is Avahi actually useful without DBus?

This reminds me that I've been wanting to gut that recipe for a long time now...

Ross
On Wed, 28 Nov 2018 at 08:16, Jens Rehsack <sno@netbsd.org> wrote:
>
> When built without D-Bus, libavahi-client is not build:
>   Building libavahi-client:           no   (You need avahi-daemon and D-Bus!)
> which causes avahi-dev RDEPENDS failing when creating an image
> containing development-tools:
>  *   - nothing provides libavahi-client = 0.7-r0 needed by avahi-dev-0.7-r0.cortexa8hf-neon
>
> Signed-off-by: Jens Rehsack <sno@netbsd.org>
> ---
>  meta/recipes-connectivity/avahi/avahi_0.7.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> index 3d5f334a88..2e04d304c7 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> @@ -38,7 +38,8 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
>  FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*  ${libdir}/girepository-1.0/Avahi*.typelib"
>  FILES_avahi-utils = "${bindir}/avahi-*"
>
> -RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})"
> +RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV})"
> +RDEPENDS_${PN}-dev += "${@["", " libavahi-client (= ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
>
>  RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns"
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core