From: Karsten Sperling Date: Tue, 8 Jul 2025 01:25:39 +0000 (+1200) Subject: mbedtls: Apply configuration in Configure instead of Prepare X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F19358%2Fhead;p=thirdparty%2Fopenwrt.git mbedtls: Apply configuration in Configure instead of Prepare This ensures mbedtls_config.h is correctly updated and the package rebuilt accordingly when configuration options are changed after the source is first prepared. Signed-off-by: Karsten Sperling Link: https://github.com/openwrt/openwrt/pull/19358 Signed-off-by: Hauke Mehrtens --- diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index 017b4b442a9..655526eecbe 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -137,14 +137,12 @@ CMAKE_OPTIONS += \ -DENABLE_TESTING:Bool=OFF \ -DENABLE_PROGRAMS:Bool=ON -define Build/Prepare - $(call Build/Prepare/Default) - - $(if $(strip $(foreach opt,$(MBEDTLS_BUILD_OPTS),$($(opt)))), - $(foreach opt,$(MBEDTLS_BUILD_OPTS), - $(PKG_BUILD_DIR)/scripts/config.py \ - -f $(PKG_BUILD_DIR)/include/mbedtls/mbedtls_config.h \ - $(if $($(opt)),set,unset) $(patsubst CONFIG_%,%,$(opt))),) +define Build/Configure + $(call Build/Configure/Default,) + $(foreach opt,$(MBEDTLS_BUILD_OPTS), + $(PKG_BUILD_DIR)/scripts/config.py \ + -f $(PKG_BUILD_DIR)/include/mbedtls/mbedtls_config.h \ + $(if $($(opt)),set,unset) $(patsubst CONFIG_%,%,$(opt))) endef define Build/InstallDev