[oe-commits] [openembedded-core] 03/03: avahi: avoid depending on skipped package

git at git.openembedded.org git at git.openembedded.org
Fri Dec 7 12:56:38 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 5c8dc0f9bcb56f7f2cde551865f6e9fefe6e77dc
Author: Jens Rehsack <sno at netbsd.org>
AuthorDate: Wed Nov 28 09:15:30 2018 +0100

    avahi: avoid depending on skipped package
    
    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 at netbsd.org>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.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 3d5f334..2e04d30 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"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list