[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ionen Wolkens]

commit:     d4a350cbc34fa6cc2c013a397c0aac53ae0bb0b1
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 04:36:40 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 05:10:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a350cb

qt6-build.eclass: replace assert with pipestatus

Not very interesting to show pipestatus -v when the 2nd command
is just tail(1), realistically it's CC that will have failed.

Preemptively limit to EAPI=8 for when port to 9, albeit that will
likely be short lived as there is no need for extended EAPI=8 support
here after Qt ebuilds are migrated & stabilized.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 eclass/qt6-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 2dec4b7ec14e..3d3531dd96d5 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -22,6 +22,7 @@ _QT6_BUILD_ECLASS=1
        die "${ECLASS} is only to be used for building Qt6"
 
 inherit cmake flag-o-matic toolchain-funcs
+[[ ${EAPI} == 8 ]] && inherit eapi9-pipestatus
 
 # @ECLASS_VARIABLE: QT6_BUILD_TYPE
 # @DESCRIPTION:
@@ -321,7 +322,7 @@ _qt6-build_sanitize_cpu_flags() {
                                        bad
                                        #endif
                                EOF
-                               assert
+                               pipestatus || die
                        )"
                        [[ ${_} == bad ]] && bad=1 && break
                done
@@ -342,7 +343,7 @@ _qt6-build_sanitize_cpu_flags() {
                        #  endif
                        #endif
                EOF
-               assert
+               pipestatus || die
        )
 
        cpuflags+=("${cpuflags_filter_only[@]}")