From 30982721ab3129928fa0e3c06717350876de4f2d Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 15 Jun 2021 21:34:40 +0300 Subject: [PATCH] build, qt: Force bootstrap while building linguist tools Qt lrelease tool depends on the xml module. This change guarantees that it is always available after being bootstrapped. --- depends/packages/qt.mk | 1 + depends/patches/qt/qttools_src.pro | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 322c35156f6..df478bec893 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -66,6 +66,7 @@ $(package)_config_opts += -no-system-proxies $(package)_config_opts += -no-use-gold-linker $(package)_config_opts += -nomake examples $(package)_config_opts += -nomake tests +$(package)_config_opts += -nomake tools $(package)_config_opts += -opensource $(package)_config_opts += -pkg-config $(package)_config_opts += -prefix $(host_prefix) diff --git a/depends/patches/qt/qttools_src.pro b/depends/patches/qt/qttools_src.pro index 487e226e973..6ef71a09427 100644 --- a/depends/patches/qt/qttools_src.pro +++ b/depends/patches/qt/qttools_src.pro @@ -1,2 +1,6 @@ TEMPLATE = subdirs SUBDIRS = linguist + +fb = force_bootstrap +CONFIG += $$fb +cache(CONFIG, add, fb)