mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/hiawatha: mbedtls is mandatory, not optional

Browse Source 
hiawatha is unconditionally using mbedtls since bump to version 11.1 in
commit 24e4c888c3 (e.g. wigwam.c includes
"mbedtls/md5.h")

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine
2022-01-09 23:16:32 +01:00
committed by Arnout Vandecappelle (Essensium/Mind)
parent d01f340132
commit 4043bc0c9c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/hiawatha/hiawatha.mk
View File

@@ -11,7 +11,10 @@ HIAWATHA_LICENSE = GPL-2.0
HIAWATHA_LICENSE_FILES = LICENSE HIAWATHA_LICENSE_FILES = LICENSE
HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver HIAWATHA_CPE_ID_VENDOR = hiawatha-webserver
# Disable system mbedtls as hiawatha needs mbedtls 3.x
HIAWATHA_CONF_OPTS = \ HIAWATHA_CONF_OPTS = \
-DINSTALL_MBEDTLS_HEADERS=OFF \
-DUSE_SYSTEM_MBEDTLS=OFF \
-DENABLE_TOOLKIT=OFF \ -DENABLE_TOOLKIT=OFF \
-DCONFIG_DIR=/etc/hiawatha \ -DCONFIG_DIR=/etc/hiawatha \
-DLOG_DIR=/var/log \ -DLOG_DIR=/var/log \
@@ -20,11 +23,7 @@ HIAWATHA_CONF_OPTS = \
-DWORK_DIR=/var/lib/hiawatha -DWORK_DIR=/var/lib/hiawatha
ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
# Disable system mbedtls as hiawatha needs mbedtls 3.x HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON
HIAWATHA_CONF_OPTS += \
-DENABLE_TLS=ON \
-DINSTALL_MBEDTLS_HEADERS=OFF \
-DUSE_SYSTEM_MBEDTLS=OFF
else else
HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF
endif endif