commit: 3b0d126e52f60b0dea062c6a811f4de646d627bc Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Mon Nov 7 17:48:23 2022 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> 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 <tupone <AT> 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
