[prev in list] [next in list] [prev in thread] [next in thread]
List: gentoo-dev
Subject: [gentoo-dev] [PATCH 1/2] meson.eclass: call die -n in phase helpers
From: Mike Gilbert <floppym () gentoo ! org>
Date: 2024-03-26 14:59:41
Message-ID: 20240326150152.1932785-1-floppym () gentoo ! org
[Download RAW message or body]
This allows the ebuild author to treat some errors as nonfatal.
Signed-off-by: Mike Gilbert <floppym@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
--
2.44.0
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic