package/hiawatha: mbedtls is mandatory, not optional
PATCH 1/2 package/hiawatha: mbedtls is mandatory, not optional
hiawatha is unconditionally using mbedtls since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e (e.g. wigwam.c includes "mbedtls/md5.h")
--- package/hiawatha/hiawatha.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
package/hiawatha/hiawatha.mk +4 -5
@@ -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
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/2 package/hiawatha: disable ASM if needed
Disable ASM as already done in mbedtls package to avoid the following build failure raised since commit 4e36e8f2081a66f477dd038793082045876d65ee:
In file included from /home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c:41:/home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bignum.c: In function 'mpi_mul_hlp':/home/buildroot/autobuild/instance-2/output-1/build/hiawatha-11.1/mbedtls/library/bn_mul.h:86:13: error: the register 'hi' cannot be clobbered in 'asm' for the current target
86 | #define asm __asm
| ^~~~~
Fixes:
- http://autobuild.buildroot.org/results/5436b44777c5d417ae427b99602f516fd8f9489d
--- package/hiawatha/hiawatha.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
package/hiawatha/hiawatha.mk +18 -0
@@ -22,6 +22,24 @@ HIAWATHA_CONF_OPTS = \ -DWEBROOT_DIR=/var/www/hiawatha \ -DWORK_DIR=/var/lib/hiawatha +define HIAWATHA_MBEDTLS_DISABLE_ASM + $(SED) '/^#define MBEDTLS_AESNI_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ + $(@D)/mbedtls/include/mbedtls/mbedtls_config.h +endef + +# ARM in thumb mode breaks debugging with asm optimizations +# Microblaze asm optimizations are broken in general +# MIPS R6 asm is not yet supported +ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +HIAWATHA_POST_CONFIGURE_HOOKS += HIAWATHA_MBEDTLS_DISABLE_ASM +endif + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DENABLE_TLS=ON else
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Arnout Vandecappelle
AppliedQuoted 5 lines · Fabrice Fontaine
hiawatha is unconditionally using mbedtls since bump to version 11.1 in commit
24e4c888c3d36e3943206ea55894b84344cc8b2e(e.g.wigwam.cincludes "mbedtls/md5.h")Signed-off-by Fabrice Fontaine <[email protected]>
Applied both to master, thanks.
Regards,
Arnout
Quoted 23 lines
--- package/hiawatha/hiawatha.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)package/hiawatha/hiawatha.mk +3
-0@@ -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
package/hiawatha/hiawatha.mk HIAWATHA_CONF_OPTS = \ · line 29
Quoted 10 lines
package/hiawatha/hiawatha.mk +1
-5ifeq ($(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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot