[PATCH] bluez5: fix builds that require ell support

[PATCH] bluez5: fix builds that require ell support

[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.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index eee7a53cd61..73e98f2b6d4 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -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 \
-- 
2.25.1

Re: [OE-core] [PATCH] bluez5: fix builds that require ell support

[Adrian Bunk]

On Mon, Aug 24, 2020 at 02:44:51PM -0500, Peter A. Bigot wrote:
> 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.
>...
> -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