From d056cc93906436b1be4a56b51770f2e2c8bf7c9c Mon Sep 17 00:00:00 2001 From: Nandor Han Date: Fri, 1 Oct 2021 15:41:33 +0300 Subject: libiio: depend on avahi only when network backed is used The `avahi` dependency is needed only when network backend is used. The current dependency configuration will add the `avahi` dependency regardless if network backend is used or not. Move the `avahi` dependency to be part of `PACKAGECONFIG` configuration which will insert the dependency only when needed. Signed-off-by: Nandor Han Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/recipes-support/libiio/libiio_git.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb index 6ac534a288..488d4e3b0b 100644 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-oe/recipes-support/libiio/libiio_git.bb @@ -18,7 +18,6 @@ DISTUTILS_SETUP_PATH ?= "${B}/bindings/python/" DEPENDS = " \ flex-native bison-native libaio \ - ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ " inherit cmake python3native systemd setuptools3 @@ -31,8 +30,13 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "usb_backend network_backend serial_backend" +NETWORK_BACKEND_DEPENDENCIES = "\ + libxml2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ +" + PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2" -PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF, ${NETWORK_BACKEND_DEPENDENCIES}" PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2" PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" -- cgit 1.2.3-korg