Browse Source

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 <a.heider@gmail.com>
lilik-openwrt-22.03
Andre Heider 3 years ago
parent
commit
f1c40e3840
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      devel/meson/meson.mk

+ 2
- 0
devel/meson/meson.mk View File

@ -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 \


Loading…
Cancel
Save