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 05EF0139694 for ; Tue, 27 Jun 2017 07:06:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4480621C096; Tue, 27 Jun 2017 07:06:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FF4021C096 for ; Tue, 27 Jun 2017 07:06:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 401D433BEBE for ; Tue, 27 Jun 2017 07:06:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C89C3746F for ; Tue, 27 Jun 2017 07:06:08 +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: <1498547150.cea81d0f521d474af7a09b0df8fd2dfeefd46ae6.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gprbuild/gprbuild-2016.ebuild dev-ada/gprbuild/gprbuild-2017.ebuild X-VCS-Directories: dev-ada/gprbuild/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: cea81d0f521d474af7a09b0df8fd2dfeefd46ae6 X-VCS-Branch: master Date: Tue, 27 Jun 2017 07:06:08 +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: 1281ae0a-06e0-4652-a036-4f3bc986db48 X-Archives-Hash: af43073848ecd99248ce621074522ae7 commit: cea81d0f521d474af7a09b0df8fd2dfeefd46ae6 Author: Tupone Alfredo gentoo org> AuthorDate: Tue Jun 27 07:05:50 2017 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jun 27 07:05:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea81d0f dev-ada/gprbuild: Add use flags gnat_2016 & gnat_2017 to 2016 version too Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/gprbuild-2016.ebuild | 38 ++++++++++++++--------------------- dev-ada/gprbuild/gprbuild-2017.ebuild | 7 +++---- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index c880ef95b51..60d1b029292 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -15,35 +15,28 @@ SRC_URI=" bootstrap? ( http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> xmlada-gpl-${PV}-src.tar.gz )" - LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="bootstrap +shared static static-pic" +IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" -DEPEND="dev-lang/gnat-gpl:= - !bootstrap? ( dev-ada/xmlada )" +DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) + gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) + gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP}-src -REQUIRED_USE="bootstrap? ( !shared !static !static-pic )" +REQUIRED_USE="bootstrap? ( !shared !static !static-pic ) + ^^ ( gnat_2016 gnat_2017 )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -pkg_setup() { - GCC=${ADA:-$(tc-getCC)} - GNATMAKE="${GCC/gcc/gnatmake}" - if [[ -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 ADA=gcc-4.9.4 in make.conf" - die "ada compiler not available" - fi -} - src_prepare() { - gnatbase=$(basename ${GCC}) - GCC_PV=${gnatbase#*gcc-} + if use gnat_2016; then + GCC_PV=4.9.4 + else + GCC_PV=6.3.0 + fi sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml default } @@ -58,12 +51,14 @@ bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" src_compile() { + GCC=${CHOST}-gcc-${GCC_PV} if use bootstrap; then + GNATMAKE=${CHOST}-gnatmake-${GCC_PV} local xmlada_src="../xmlada-gpl-${PV}-src" incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \ -I${xmlada_src}/schema -I${xmlada_src}/unicode \ -I${xmlada_src}/input_sources" - $(tc-getCC) -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o + ${GCC} -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o || die for bin in ${bin_progs}; do ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ -o ${bin} -largs gpr_imports.o || die @@ -88,7 +83,7 @@ src_install() { exeinto /usr/libexec/gprbuild doexe ${lib_progs} insinto /usr/share/gprconfig - doins share/gprconfig/*.xml + doins share/gprconfig/* insinto /usr/share/gpr doins share/_default.gpr else @@ -98,9 +93,6 @@ src_install() { emake DESTDIR="${D}" libgpr.install.${kind} fi done - mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die - mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF} || die - rmdir "${D}"/usr/share/doc/${PN} || die fi insinto /usr/share/gprconfig doins gnat-${GCC_PV}.xml diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 60fa7d00f00..a6101175e17 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -20,10 +20,9 @@ SLOT="0" KEYWORDS="~amd64" IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" -DEPEND=" - !bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) - gnat_2016? ( =dev-lang/gnat-gpl-2016 ) - gnat_2017? ( =dev-lang/gnat-gpl-2017 )" +DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) + gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) + gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP}-src