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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4DFA139083 for ; Wed, 22 Nov 2017 18:10:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFCBCE0ED5; Wed, 22 Nov 2017 18:10:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96E79E0ED5 for ; Wed, 22 Nov 2017 18:10:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4EDE6341236 for ; Wed, 22 Nov 2017 18:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD713A3E4 for ; Wed, 22 Nov 2017 18:10:46 +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: <1511374233.0a8f60efdf18f7b64aefc5cba8e0132acd85c277.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gps/gps-2017.ebuild X-VCS-Directories: dev-ada/gps/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 0a8f60efdf18f7b64aefc5cba8e0132acd85c277 X-VCS-Branch: master Date: Wed, 22 Nov 2017 18:10:46 +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-Archives-Salt: 4f694f7e-9be9-4144-bc28-462169fa5d4a X-Archives-Hash: c316957327845cc4beb198aefd9a4e8b commit: 0a8f60efdf18f7b64aefc5cba8e0132acd85c277 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Nov 22 18:10:33 2017 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Wed Nov 22 18:10:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8f60ef dev-ada/gps: use only (gnat)gcc-6.3.0 compiler Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/gps/gps-2017.ebuild | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild index a07971aa8bb..8741b915152 100644 --- a/dev-ada/gps/gps-2017.ebuild +++ b/dev-ada/gps/gps-2017.ebuild @@ -36,26 +36,13 @@ S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -pkg_setup() { - GCC=${ADA:-$(tc-getCC)} - GNATLS="${GCC/gcc/gnatls}" - GNAT="${GCC/gcc/gnat}" - GNATMAKE="${GCC/gcc/gnatmake}" - if [[ -z "$(type ${GNATLS} 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 ADA=gcc-6.3.0 in make.conf" - die "ada compiler not available" - fi - python-single-r1_pkg_setup -} - src_prepare() { default + GCC_PV=6.3.0 mv configure.{in,ac} || die sed -i \ - -e "s:@GNATMAKE@:${GNATMAKE}:g" \ - -e "s:@GNAT@:${GNAT}:g" \ + -e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \ + -e "s:@GNAT@:gnat-${GCC_PV}:g" \ aclocal.m4 \ || die eautoreconf