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 CA932158020 for ; Mon, 7 Nov 2022 17:50:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06F32E086C; Mon, 7 Nov 2022 17:50:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E2376E086C for ; Mon, 7 Nov 2022 17:50:14 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 266BD33DF47 for ; Mon, 7 Nov 2022 17:50:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75CF9609 for ; Mon, 7 Nov 2022 17:50:12 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1667843384.3b0d126e52f60b0dea062c6a811f4de646d627bc.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/gnat-gpl-2020.ebuild dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild X-VCS-Directories: dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 3b0d126e52f60b0dea062c6a811f4de646d627bc X-VCS-Branch: master Date: Mon, 7 Nov 2022 17:50:12 +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: e993df87-3138-499e-a985-70ed24e54876 X-Archives-Hash: 702253aae55cba1244c5b4f0c83814a6 commit: 3b0d126e52f60b0dea062c6a811f4de646d627bc Author: Alfredo Tupone gentoo org> AuthorDate: Mon Nov 7 17:48:23 2022 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Mon Nov 7 17:49:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0d126e dev-lang/gnat-gpl: move error diagnostics Closes: https://bugs.gentoo.org/879563 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/gnat-gpl/gnat-gpl-2020.ebuild | 20 +++++++++----------- dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild | 3 ++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild index efc7ef0e3532..a70c2cc890dc 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild @@ -52,17 +52,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MYP} PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" -src_unpack() { - if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then - eerror "You need a gcc compiler that provides the Ada Compiler:" - eerror "1) use gcc-config to select the right compiler or" - eerror "2) set the bootstrap use flag" - die "ada compiler not available" - fi - - toolchain_src_unpack -} - src_prepare() { if use amd64; then BTSTRP=${BTSTRP_AMD64} @@ -83,6 +72,15 @@ src_prepare() { if [[ ${gnatpath} != "." ]] ; then GNATMAKE="${gnatpath}/${GNATMAKE}" fi + + if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then + eerror "You need a gcc compiler that provides the Ada Compiler:" + eerror "1) use gcc-config to select the right compiler or" + eerror "2) set the bootstrap use flag or" + eerror "3) set ADA to a working gcc ada compiler" + die "ada compiler not available" + fi + if use bootstrap; then rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \ || die diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild index c757e0fa766a..0ab2e943e258 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild @@ -74,7 +74,8 @@ src_prepare() { if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then eerror "You need a gcc compiler that provides the Ada Compiler:" eerror "1) use gcc-config to select the right compiler or" - eerror "2) set the bootstrap use flag" + eerror "2) set the bootstrap use flag or" + eerror "3) set ADA to a working gcc ada compiler" die "ada compiler not available" fi