commit: 75ae2f8d64e3fad9a1df5ff611ccbce3d4290e3b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 6 21:48:01 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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
