All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnout Vandecappelle <arnout@mind.be>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>, buildroot@buildroot.org
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: Re: [Buildroot] [PATCH 1/2] package/hiawatha: mbedtls is mandatory, not optional
Date: Mon, 10 Jan 2022 08:20:25 +0100	[thread overview]
Message-ID: <1151a8f7-e692-6fc7-9bae-44b39ae0ad21@mind.be> (raw)
In-Reply-To: <20220109221633.1307381-1-fontaine.fabrice@gmail.com>



On 09/01/2022 23:16, Fabrice Fontaine wrote:
> hiawatha is unconditionally using mbedtls since bump to version 11.1 in
> commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes
> "mbedtls/md5.h")
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied both to master, thanks.

  Regards,
  Arnout

> ---
>   package/hiawatha/hiawatha.mk | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
> index 017592de1e..ed9f8aba54 100644
> --- a/package/hiawatha/hiawatha.mk
> +++ b/package/hiawatha/hiawatha.mk
> @@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0
>   HIAWATHA_LICENSE_FILES = LICENSE
>   HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver
>   
> +# Disable system mbedtls as hiawatha needs mbedtls 3.x
>   HIAWATHA_CONF_OPTS = \
> +	-DINSTALL_MBEDTLS_HEADERS=OFF \
> +	-DUSE_SYSTEM_MBEDTLS=OFF \
>   	-DENABLE_TOOLKIT=OFF \
>   	-DCONFIG_DIR=/etc/hiawatha \
>   	-DLOG_DIR=/var/log \
> @@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \
>   	-DWORK_DIR=/var/lib/hiawatha
>   
>   ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
> -# Disable system mbedtls as hiawatha needs mbedtls 3.x
> -HIAWATHA_CONF_OPTS += \
> -	-DENABLE_TLS=ON \
> -	-DINSTALL_MBEDTLS_HEADERS=OFF \
> -	-DUSE_SYSTEM_MBEDTLS=OFF
> +HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON
>   else
>   HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF
>   endif
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      parent reply	other threads:[~2022-01-10  7:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-09 22:16 [Buildroot] [PATCH 1/2] package/hiawatha: mbedtls is mandatory, not optional Fabrice Fontaine
2022-01-09 22:16 ` [Buildroot] [PATCH 2/2] package/hiawatha: disable ASM if needed Fabrice Fontaine
2022-01-10  7:20 ` Arnout Vandecappelle [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1151a8f7-e692-6fc7-9bae-44b39ae0ad21@mind.be \
    --to=arnout@mind.be \
    --cc=buildroot@buildroot.org \
    --cc=fontaine.fabrice@gmail.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.