Skip to contentSkip to conversation

bluez5: fix builds that require ell support

PATCH Superseded Peter A. Bigot 2 participants 2 messages Aug 24, 2020 – Aug 25, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bluez5: fix builds that require ell support

Shortly after the recipe was updated to add ell as a mesh dependency the way ell was integrated into bluez5 was changed. Add the new configuration options required for an external ell.

---
 meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/bluez5/bluez5.inc +2 -2
index eee7a53cd61..73e98f2b6d4 100644
@@ -42,8 +42,8 @@ PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-sixaxis"
 PACKAGECONFIG[tools] = "--enable-tools,--disable-tools"
 PACKAGECONFIG[threads] = "--enable-threads,--disable-threads"
 PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated"
-PACKAGECONFIG[mesh] = "--enable-mesh,--disable-mesh, json-c ell"
-PACKAGECONFIG[btpclient] = "--enable-btpclient,--disable-btpclient, ell"
+PACKAGECONFIG[mesh] = "--enable-mesh --enable-external-ell,--disable-mesh --disable-external-ell, json-c ell"
+PACKAGECONFIG[btpclient] = "--enable-btpclient --enable-external-ell,--disable-btpclient --disable-external-ell, ell"
 PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
Signature · 1 line
2.25.1
#1 lore raw

meta/recipes-connectivity/bluez5/bluez5.inc PACKAGECONFIG[sixaxis] = "--enable-sixaxis,--disable-sixaxis" · line 46

Quoted 9 lines · Peter A. Bigot

Shortly after the recipe was updated to add ell as a mesh dependency the way ell was integrated into bluez5 was changed. Add the new configuration options required for an external ell.
...

meta/recipes-connectivity/bluez5/bluez5.inc +2 -2
-PACKAGECONFIG[mesh] = "--enable-mesh,--disable-mesh, json-c ell"
-PACKAGECONFIG[btpclient] = "--enable-btpclient,--disable-btpclient, ell"
+PACKAGECONFIG[mesh] = "--enable-mesh --enable-external-ell,--disable-mesh --disable-external-ell, json-c ell"
+PACKAGECONFIG[btpclient] = "--enable-btpclient --enable-external-ell,--disable-btpclient --disable-external-ell, ell"
...

This won't work if exactly one these two options is enabled.

What about unconditional --enable-external-ell and ell DEPENDS instead? It seems to link with the external ell only when necessary.

cu
Adrian