From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 15 Mar 2024 10:56:44 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rl4Iu-007gDQ-0l for lore@lore.pengutronix.de; Fri, 15 Mar 2024 10:56:44 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rl4It-0001ts-Ms; Fri, 15 Mar 2024 10:56:43 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rl4IZ-0001qR-9Z; Fri, 15 Mar 2024 10:56:23 +0100 From: Michael Tretter To: ptxdist@pengutronix.de Date: Fri, 15 Mar 2024 10:56:23 +0100 Message-Id: <20240315095623.1888719-1-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] host-meson: ignore uic if it is not found X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: mtr@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Qt builds and installs the uic only if Widgets are enabled, but meson always checks for the uic when checking for the Qt tools. This breaks the build of applications that use Qt, but don't use Widgets. Add a patch to ignore the uic if it is not found, as PTXdist already correctly handles the dependencies. Signed-off-by: Michael Tretter --- ...04-HACK-don-t-fail-if-uic-is-missing.patch | 29 +++++++++++++++++++ patches/meson-1.3.0/series | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch diff --git a/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch new file mode 100644 index 000000000000..c404d3149d4c --- /dev/null +++ b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch @@ -0,0 +1,29 @@ +From: Michael Tretter +Date: Tue, 12 Mar 2024 18:22:06 +0100 +Subject: [PATCH] HACK: don't fail if uic is missing + +Qt5 builds the uic only if Widgets are enabled. The uic is not required +for applications that don't use Widgets, but is required as standard +tool by meson. + +Ignore uic if it is not found. + +Signed-off-by: Michael Tretter +--- + mesonbuild/modules/qt.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py +index b3242ceaf167..26b5dbc9fc0d 100644 +--- a/mesonbuild/modules/qt.py ++++ b/mesonbuild/modules/qt.py +@@ -281,6 +281,9 @@ class QtBaseModule(ExtensionModule): + if tool.name == 'lrelease': + mlog.warning('Ignoring missing lrelease') + continue ++ if tool.name == 'uic': ++ mlog.warning('Ignoring missing uic') ++ continue + if required: + raise MesonException('Qt tools not found') + return False diff --git a/patches/meson-1.3.0/series b/patches/meson-1.3.0/series index 209f73f563c2..3bba04f5b328 100644 --- a/patches/meson-1.3.0/series +++ b/patches/meson-1.3.0/series @@ -3,4 +3,5 @@ 0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch 0002-HACK-enable-NEON-only-for-ARMv7.patch 0003-HACK-don-t-fail-if-lrelease-is-missing.patch -# ab164f87a7e08b87479345777ce62823 - git-ptx-patches magic +0004-HACK-don-t-fail-if-uic-is-missing.patch +# 344e721ffeeec9faa5876797156d7064 - git-ptx-patches magic -- 2.39.2