[Buildroot] [PATCH 1/1] package/libwebsockets: add mbedtls optional dependency

[Buildroot] [PATCH 1/1] package/libwebsockets: add mbedtls optional dependency

[Fabrice Fontaine]

mbedtls is an optional dependency since version 2.4.0 and
https://github.com/warmcat/libwebsockets/commit/3aaf38d3d89d0436301fe66d9a5c097ea4fb1064

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libwebsockets/libwebsockets.mk | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index 152659cee6..f8093b92fa 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -27,9 +27,18 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl
-LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=ON
+LIBWEBSOCKETS_CONF_OPTS += \
+	-DLWS_WITH_SSL=ON \
+	-DLWS_WITH_MBEDTLS=OFF
+else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+LIBWEBSOCKETS_DEPENDENCIES += mbedtls
+LIBWEBSOCKETS_CONF_OPTS += \
+	-DLWS_WITH_SSL=ON \
+	-DLWS_WITH_MBEDTLS=ON
 else
-LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF
+LIBWEBSOCKETS_CONF_OPTS += \
+	-DLWS_WITH_SSL=OFF \
+	-DLWS_WITH_MBEDTLS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEV),y)
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/libwebsockets: add mbedtls optional dependency

[Arnout Vandecappelle]

On 13/04/2022 22:48, Fabrice Fontaine wrote:
> mbedtls is an optional dependency since version 2.4.0 and
> https://github.com/warmcat/libwebsockets/commit/3aaf38d3d89d0436301fe66d9a5c097ea4fb1064
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/libwebsockets/libwebsockets.mk | 13 +++++++++++--
>   1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
> index 152659cee6..f8093b92fa 100644
> --- a/package/libwebsockets/libwebsockets.mk
> +++ b/package/libwebsockets/libwebsockets.mk
> @@ -27,9 +27,18 @@ endif
>   
>   ifeq ($(BR2_PACKAGE_OPENSSL),y)
>   LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl
> -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=ON
> +LIBWEBSOCKETS_CONF_OPTS += \
> +	-DLWS_WITH_SSL=ON \
> +	-DLWS_WITH_MBEDTLS=OFF
> +else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
> +LIBWEBSOCKETS_DEPENDENCIES += mbedtls
> +LIBWEBSOCKETS_CONF_OPTS += \
> +	-DLWS_WITH_SSL=ON \
> +	-DLWS_WITH_MBEDTLS=ON
>   else
> -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF
> +LIBWEBSOCKETS_CONF_OPTS += \
> +	-DLWS_WITH_SSL=OFF \
> +	-DLWS_WITH_MBEDTLS=OFF
>   endif
>   
>   ifeq ($(BR2_PACKAGE_LIBEV),y)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/libwebsockets: add mbedtls optional dependency

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > mbedtls is an optional dependency since version 2.4.0 and
 > https://github.com/warmcat/libwebsockets/commit/3aaf38d3d89d0436301fe66d9a5c097ea4fb1064

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot