From f1c40e3840f6f51b3cf6a74331bd128eeb8b3961 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 9 Mar 2021 10:12:38 +0100 Subject: [PATCH] meson: reconfigure on incremental builds When toggling a package specific config knob, we need to pass --reconfigure to the meson setup command if an earlier build already exists. Fixes #15032. Signed-off-by: Andre Heider --- devel/meson/meson.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/meson/meson.mk b/devel/meson/meson.mk index ac74bd5bf..6ae9c8da2 100644 --- a/devel/meson/meson.mk +++ b/devel/meson/meson.mk @@ -97,6 +97,7 @@ endef define Host/Configure/Meson $(call Meson/CreateNativeFile,$(HOST_BUILD_DIR)/openwrt-native.txt) $(call Meson, \ + setup $(if $(wildcard $(MESON_HOST_BUILD_DIR)/meson-*),--reconfigure,) \ --native-file $(HOST_BUILD_DIR)/openwrt-native.txt \ $(MESON_HOST_ARGS) \ $(MESON_HOST_BUILD_DIR) \ @@ -120,6 +121,7 @@ define Build/Configure/Meson $(call Meson/CreateNativeFile,$(PKG_BUILD_DIR)/openwrt-native.txt) $(call Meson/CreateCrossFile,$(PKG_BUILD_DIR)/openwrt-cross.txt) $(call Meson, \ + setup $(if $(wildcard $(MESON_BUILD_DIR)/meson-*),--reconfigure,) \ --buildtype plain \ --native-file $(PKG_BUILD_DIR)/openwrt-native.txt \ --cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \