From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 96D88158089 for ; Thu, 7 Sep 2023 10:03:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB8D72BC037; Thu, 7 Sep 2023 10:03:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91DA92BC033 for ; Thu, 7 Sep 2023 10:03:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44964335C56 for ; Thu, 7 Sep 2023 10:03:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AECD5113A for ; Thu, 7 Sep 2023 10:03:11 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1694080895.75ae2f8d64e3fad9a1df5ff611ccbce3d4290e3b.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qt6-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 75ae2f8d64e3fad9a1df5ff611ccbce3d4290e3b X-VCS-Branch: master Date: Thu, 7 Sep 2023 10:03:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eeea7085-3cae-44d4-8e11-b6400a2b71ba X-Archives-Hash: a33de3b8902941b753547794cd8c672a commit: 75ae2f8d64e3fad9a1df5ff611ccbce3d4290e3b Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 6 21:48:01 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Sep 7 10:01:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ae2f8d qt6-build.eclass: abort build rather than skip on deps issues Does not cover everything, there are some more "custom" checks that may either abort or skip. This is for the generic top level one that is the same across all of dev-qt/*:6 Afaik none of these should be able to trigger right now, but not impossible been overlooking if it just been skipped. Skipping+succeeding on tinderboxes that use minimal dependencies may especially lead to confusing issues without this. Signed-off-by: Ionen Wolkens gentoo.org> eclass/qt6-build.eclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 11e9844346a4..e4992ba58078 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -98,6 +98,12 @@ qt6-build_src_unpack() { qt6-build_src_prepare() { cmake_src_prepare + if [[ -e CMakeLists.txt ]]; then + # build may be skipped entirely and install nothing without errors + # if checking for a major dependency/condition failed + sed -i '/message(NOTICE.*Skipping/s/NOTICE/ERROR/' CMakeLists.txt || die + fi + if in_iuse test && use test && [[ -e tests/auto/CMakeLists.txt ]]; then # upstream seems to install before running tests, and cmake # subdir that is present in about half of the Qt6 components