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 8504C158041 for ; Thu, 4 Apr 2024 01:07:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2102E2A2D; Thu, 4 Apr 2024 01:07:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 CA2D6E2A2D for ; Thu, 4 Apr 2024 01:07:43 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE57834324C for ; Thu, 4 Apr 2024 01:07:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29E1A166F for ; Thu, 4 Apr 2024 01:07:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1712192798.4ba5414687d20ba1369e7e2833ba563c1815fcbe.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/meson.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4ba5414687d20ba1369e7e2833ba563c1815fcbe X-VCS-Branch: master Date: Thu, 4 Apr 2024 01:07:41 +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: 4ca30da6-d5b6-4a49-9edf-2a7401ad370f X-Archives-Hash: fbd68644722d0fae212629ecca9b66d7 commit: 4ba5414687d20ba1369e7e2833ba563c1815fcbe Author: Mike Gilbert gentoo org> AuthorDate: Tue Mar 26 15:01:51 2024 +0000 Commit: Sam James gentoo 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 gentoo.org> Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James 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