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 EEC94138334 for ; Fri, 12 Oct 2018 07:01:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C527CE09BC; Fri, 12 Oct 2018 07:01:32 +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 7AA70E09BC for ; Fri, 12 Oct 2018 07:01:32 +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 C79F5335CB5 for ; Fri, 12 Oct 2018 07:01:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDD573D9 for ; Fri, 12 Oct 2018 07:01:26 +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: <1539327673.9670f34afab1041f619dec6fee99865f9a0cfe1b.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gprbuild/files/gprbuild-2018.xml dev-ada/gprbuild/gprbuild-2018.ebuild X-VCS-Directories: dev-ada/gprbuild/ dev-ada/gprbuild/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 9670f34afab1041f619dec6fee99865f9a0cfe1b X-VCS-Branch: master Date: Fri, 12 Oct 2018 07:01:26 +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: b6ab2d4b-c092-4634-95f9-c1db41a21a73 X-Archives-Hash: 80f682d0f3e236ac2df3e6095d8a5ae0 commit: 9670f34afab1041f619dec6fee99865f9a0cfe1b Author: Tupone Alfredo gentoo org> AuthorDate: Fri Oct 12 07:01:13 2018 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Fri Oct 12 07:01:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9670f34a dev-ada/gprbuild: Remove duplicate file Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2018.xml | 85 -------------------------------- dev-ada/gprbuild/gprbuild-2018.ebuild | 4 +- 2 files changed, 2 insertions(+), 87 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml b/dev-ada/gprbuild/files/gprbuild-2018.xml deleted file mode 100644 index 9e1e47b512e..00000000000 --- a/dev-ada/gprbuild/files/gprbuild-2018.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - GNAT-@VER@ - gnatls-@VER@ - - ${PREFIX}gnatls-@VER@ -v --version - - - Ada - - ${PREFIX}gcc-@VER@ -v - - - - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - - ${PREFIX}gcc-@VER@ -dumpmachine - - - - - - - - - - package Compiler is - for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; - for Language_Kind ("Ada") use "unit_based"; - for Dependency_Kind ("Ada") use "ALI_File"; - for Leading_Required_Switches ("Ada") use - ("-c", "-x", "ada", "-gnatA") - & Compiler'Leading_Required_Switches ("Ada"); - for Mapping_File_Switches ("Ada") use ("-gnatem="); - for Mapping_Spec_Suffix ("Ada") use "%s"; - for Mapping_Body_Suffix ("Ada") use "%b"; - for Config_File_Switches ("Ada") use ("-gnatec="); - for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE"; - for Multi_Unit_Switches ("Ada") use ("-gnateI"); - for Multi_Unit_Object_Separator ("Ada") use "~"; - for Config_Body_File_Name ("Ada") use - "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");"; - for Config_Spec_File_Name ("Ada") use - "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");"; - for Config_Body_File_Name_Index ("Ada") use - "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);"; - for Config_Spec_File_Name_Index ("Ada") use - "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);"; - for Config_Body_File_Name_Pattern ("Ada") use - "pragma Source_File_Name_Project " & - " (Body_File_Name => ""*%b""," & - " Casing => %c," & - " Dot_Replacement => ""%d"");"; - for Config_Spec_File_Name_Pattern ("Ada") use - "pragma Source_File_Name_Project " & - " (Spec_File_Name => ""*%s""," & - " Casing => %c," & - " Dot_Replacement => ""%d"");"; - for Config_File_Unique ("Ada") use "False"; - for PIC_Option ("Ada") use ("-fPIC"); - for Leading_Required_Switches ("Ada") use - Compiler'Leading_Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); - end Compiler; - - package Binder is - for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; - for Driver ("Ada") use - "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; - for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@"); - for Required_Switches ("Ada") use - Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); - end Binder; - - for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; - -for Runtime_Dir ("Ada") use "${RUNTIME_DIR(ada)}"; - for Library_Encapsulated_Supported use "true"; - - - diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild index 95d0bdafd85..3d3b6f41c7d 100644 --- a/dev-ada/gprbuild/gprbuild-2018.ebuild +++ b/dev-ada/gprbuild/gprbuild-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 @@ -37,7 +37,7 @@ src_prepare() { else GCC_PV=7.3.1 fi - sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml + sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${PN}-2017.xml > gnat-${GCC_PV}.xml default sed -i \ -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \