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

[Sam James]

commit:     4ba5414687d20ba1369e7e2833ba563c1815fcbe
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 15:01:51 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 01:06:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba54146

meson.eclass: call die -n in phase helpers

This allows the ebuild author to treat some errors as nonfatal.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/meson.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 3240fddf7e86..3074fcb09fb0 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -425,7 +425,7 @@ meson_src_configure() {
                export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS 
PKG_CONFIG_{LIBDIR,PATH}
                echo meson setup "${MESONARGS[@]}" >&2
                meson setup "${MESONARGS[@]}"
-       ) || die
+       ) || die -n
 }
 
 # @FUNCTION: meson_src_compile
@@ -450,7 +450,7 @@ meson_src_compile() {
 
        set -- meson compile "${mesoncompileargs[@]}"
        echo "$@" >&2
-       "$@" || die "compile failed"
+       "$@" || die -n "compile failed"
 }
 
 # @FUNCTION: meson_src_test
@@ -469,7 +469,7 @@ meson_src_test() {
 
        set -- meson test "${mesontestargs[@]}"
        echo "$@" >&2
-       "$@" || die "tests failed"
+       "$@" || die -n "tests failed"
 }
 
 # @FUNCTION: meson_install
@@ -488,7 +488,7 @@ meson_install() {
 
        set -- meson install "${mesoninstallargs[@]}"
        echo "$@" >&2
-       "$@" || die "install failed"
+       "$@" || die -n "install failed"
 }
 
 # @FUNCTION: meson_src_install