From 4e36e8f2081a66f477dd038793082045876d65ee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 9 Jan 2022 14:39:39 +0100 Subject: [PATCH] package/hiawatha: disable system mbedtls hiawatha needs mbedtls3 since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e: /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory 39 | #include "mbedtls/psa_util.h" | ^~~~~~~~~~~~~~~~~~~~ As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable system mbedtls to let hiawatha uses its own copy (which will be installed in $(TARGET_DIR)/usr/lib/hiawatha) Fixes: - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/hiawatha/Config.in | 1 - package/hiawatha/hiawatha.mk | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 8f1908f6f4..4b1a3ca86c 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -32,6 +32,5 @@ if BR2_PACKAGE_HIAWATHA config BR2_PACKAGE_HIAWATHA_SSL bool "hiawatha TLS support" - select BR2_PACKAGE_MBEDTLS endif diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 5618e6900d..017592de1e 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -20,8 +20,11 @@ HIAWATHA_CONF_OPTS = \ -DWORK_DIR=/var/lib/hiawatha ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON -HIAWATHA_DEPENDENCIES += mbedtls +# Disable system mbedtls as hiawatha needs mbedtls 3.x +HIAWATHA_CONF_OPTS += \ + -DENABLE_TLS=ON \ + -DINSTALL_MBEDTLS_HEADERS=OFF \ + -DUSE_SYSTEM_MBEDTLS=OFF else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif