Bläddra i källkod

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 3 år sedan
förälder
incheckning
4e36e8f208
2 ändrade filer med 5 tillägg och 3 borttagningar
  1. 0 1
      package/hiawatha/Config.in
  2. 5 2
      package/hiawatha/hiawatha.mk

+ 0 - 1
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

+ 5 - 2
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