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 9DBD4139694 for ; Mon, 26 Jun 2017 20:06:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B782B21C07C; Mon, 26 Jun 2017 20:06:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 81D0A21C07C for ; Mon, 26 Jun 2017 20:06:44 +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 34C56341797 for ; Mon, 26 Jun 2017 20:06:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDF3D747C for ; Mon, 26 Jun 2017 20:06:41 +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: <1498507391.e8347eefda91406fa8553e4328584b66df8010ad.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-2017.ebuild dev-ada/gprbuild/metadata.xml X-VCS-Directories: dev-ada/gprbuild/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: e8347eefda91406fa8553e4328584b66df8010ad X-VCS-Branch: master Date: Mon, 26 Jun 2017 20:06: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-Archives-Salt: 867cf07a-9fc6-4d9b-836b-7e36229cd3aa X-Archives-Hash: c4d563d626fec688e4f2ef81c81cbff5 commit: e8347eefda91406fa8553e4328584b66df8010ad Author: Tupone Alfredo gentoo org> AuthorDate: Mon Jun 26 20:03:11 2017 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jun 26 20:03:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8347eef dev-ada/gprbuild: add gnat_2016 and gnat_2017 use flags to select the compiler Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/gprbuild-2017.ebuild | 39 +++++++++++++---------------------- dev-ada/gprbuild/metadata.xml | 15 +++++++++----- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 277fb5c5f3f..60fa7d00f00 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -18,39 +18,26 @@ SRC_URI=" 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[static] )" +DEPEND=" + !bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) + gnat_2016? ( =dev-lang/gnat-gpl-2016 ) + gnat_2017? ( =dev-lang/gnat-gpl-2017 )" 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)} - gnatbase=$(basename ${GCC}) - if use bootstrap; then - gnatpath=$(dirname ${GCC}) - - GNATMAKE="${gnatbase/gcc/gnatmake}" - if [[ ${gnatpath} != "." ]] ; then - GNATMAKE="${gnatpath}/${GNATMAKE}" - fi - - 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 in make.conf" - die "ada compiler not available" - fi - fi -} - src_prepare() { - 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 } @@ -63,7 +50,9 @@ 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 \ diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml index 521d595c3ff..4cf88165a98 100644 --- a/dev-ada/gprbuild/metadata.xml +++ b/dev-ada/gprbuild/metadata.xml @@ -6,15 +6,20 @@ Tupone Alfredo + Compile with dev-lang/gnat-gpl-2016 + Compile with dev-lang/gnat-gpl-2017 Build shared library Build static library Build static library with pic code - XML/Ada is a set of modules that provide a simple manipulation of XML streams. It supports the whole XML 1.1 specifications, and can parse any file that follows this standard (including the contents of the DTD, although no validation of the document is done based on those). - - It also provides support for a number of other standard associated with XML, like SAX, DOM and XML schemas. - - In addition, it includes a module to manipulate Unicode streams, since this is required by the XML standard. + GPRbuild is an advanced software tool designed to help automate the + construction of multi-language systems. It removes complexity from + multi-language development by allowing developers to quickly and easily + compile and link software written in a combination of languages + including Ada, Assembler, C, C++, and Fortran. Easily extendable by + users to cover new toolchains and languages it is primarily aimed at + projects of all sizes organized into subsystems and libraries and is + particularly well-suited for compiled languages.