diff options
| author | Karsten Sperling | 2025-07-08 01:25:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-07-19 15:41:35 +0000 |
| commit | 5359639c2b743be800ebe075936946c48635333a (patch) | |
| tree | c946fb622736731878068daf7207a6f562ef28fb | |
| parent | 0ac2d64d92e89bcbefc1b5ba0205abe976ec523e (diff) | |
| download | openwrt-5359639c2b743be800ebe075936946c48635333a.tar.gz | |
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>
| -rw-r--r-- | package/libs/mbedtls/Makefile | 14 |
1 files 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 |