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>
This commit is contained in:
parent
0ac2d64d92
commit
5359639c2b
1 changed files with 6 additions and 8 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue