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@apple.com>
Link: https://github.com/openwrt/openwrt/pull/19358
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 017b4b442a9ad1b283516cac14795b9ab140beba..655526eecbee2cd34b0a03a586c55743986e2b28 100644 (file)
--- 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