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 0E9B4138334 for ; Mon, 15 Oct 2018 06:53:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC1CDE0864; Mon, 15 Oct 2018 06:53:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 881BDE0864 for ; Mon, 15 Oct 2018 06:53:13 +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 548A0335C5A for ; Mon, 15 Oct 2018 06:53:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 867BA3D6 for ; Mon, 15 Oct 2018 06:53:09 +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: <1539586380.0c39a7c5da116a8063e47ab99fb9702b472d7d74.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/libgpr/files/, dev-ada/libgpr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/libgpr/files/libgpr-2018-gentoo.patch dev-ada/libgpr/libgpr-2018.ebuild X-VCS-Directories: dev-ada/libgpr/files/ dev-ada/libgpr/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 0c39a7c5da116a8063e47ab99fb9702b472d7d74 X-VCS-Branch: master Date: Mon, 15 Oct 2018 06:53:09 +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: d5beebef-449b-4262-b157-aad634c6790b X-Archives-Hash: 3e363729f4bcea68e7e085a357087d18 commit: 0c39a7c5da116a8063e47ab99fb9702b472d7d74 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Oct 15 06:53:00 2018 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Mon Oct 15 06:53:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c39a7c5 dev-ada/libgpr: No need to select gcc compiler now Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/libgpr/files/libgpr-2018-gentoo.patch | 55 +++++++++++++++++++++++++++ dev-ada/libgpr/libgpr-2018.ebuild | 14 ++----- 2 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch b/dev-ada/libgpr/files/libgpr-2018-gentoo.patch new file mode 100644 index 00000000000..013a56b92e7 --- /dev/null +++ b/dev-ada/libgpr/files/libgpr-2018-gentoo.patch @@ -0,0 +1,55 @@ +--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 ++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 +@@ -1948,6 +1948,8 @@ + + end if; + ++ Add_Directories (Self, "/usr/share/gpr"); ++ + if Gpr_Prj_Path.all /= "" then + Add_Directories (Self, Gpr_Prj_Path.all); + end if; +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 +@@ -27,6 +27,8 @@ + Name_Buffer : String (1 .. 1_000_000); + Name_Len : Natural := 0; + ++ Last_Id : Name_Id := Name_Id'First; ++ + procedure Get_Name_String (Id : Name_Id); + procedure Get_Name_String (Id : Unit_Name_Type); + procedure Get_Name_String (Id : File_Name_Type); +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 +@@ -354,6 +354,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; + end Name_Enter; + +@@ -427,6 +429,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; + end Name_Find; + +--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 ++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +@@ -53,6 +53,10 @@ + return; + end if; + ++ if Last_Id = Name_Id'First then ++ Add_Name (""); ++ end if; ++ + Add_Name ("a"); + Add_Name ("b"); + Add_Name ("c"); diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild index c16efb2bfd5..10776c86ccd 100644 --- a/dev-ada/libgpr/libgpr-2018.ebuild +++ b/dev-ada/libgpr/libgpr-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,11 +20,11 @@ RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" + >=dev-ada/gprbuild-2018[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" S="${WORKDIR}"/${MYP}-src -PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch ) +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_configure() { emake prefix="${D}"usr setup @@ -36,14 +36,6 @@ src_compile() { -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \ gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die } - if use gnat_2016; then - GCC_PV=4.9.4 - elif use gnat_2017; then - GCC_PV=6.3.0 - else - GCC_PV=7.3.1 - fi - GCC=${CHOST}-gcc-${GCC_PV} if use shared; then build relocatable fi