aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNandor Han <nandor.han@vaisala.com>2021-10-01 15:41:33 +0300
committerArmin Kuster <akuster808@gmail.com>2021-10-07 08:16:36 -0700
commit36d9dbbcc33c6f4b3cea2ded8ba7546c730ce9b5 (patch)
tree39424f07190aaca8bf222e1c10aba1f502e7cf11
parent766bd29cd9b9139b4140c116437e532d02757ddc (diff)
downloadmeta-openembedded-contrib-36d9dbbcc33c6f4b3cea2ded8ba7546c730ce9b5.tar.gz
meta-openembedded-contrib-36d9dbbcc33c6f4b3cea2ded8ba7546c730ce9b5.tar.bz2
meta-openembedded-contrib-36d9dbbcc33c6f4b3cea2ded8ba7546c730ce9b5.zip
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 <nandor.han@vaisala.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/libiio/libiio_git.bb8
1 files 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"