[openwrt/openwrt] mbedtls: Apply configuration in Configure instead of Prepare

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 19 08:54:33 PDT 2025


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/5359639c2b743be800ebe075936946c48635333a

commit 5359639c2b743be800ebe075936946c48635333a
Author: Karsten Sperling <ksperling at apple.com>
AuthorDate: Tue Jul 8 13:25:39 2025 +1200

    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 <ksperling at apple.com>
    Link: https://github.com/openwrt/openwrt/pull/19358
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/libs/mbedtls/Makefile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 017b4b442a..655526eecb 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




More information about the lede-commits mailing list