commit: 27440b1aa409e5471622a0ad0bbebbf97e7f79c8
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 19:59:41 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 19:59:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27440b1a
dev-lang/gnat-gpl: Remove tool description file (to be put on gprbuild)
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-lang/gnat-gpl/files/gnat-gpl.xml | 94 ----------------------------------
dev-lang/gnat-gpl/gnat-gpl-2016.ebuild | 4 --
dev-lang/gnat-gpl/gnat-gpl-2017.ebuild | 4 --
3 files changed, 102 deletions(-)
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl.xml
b/dev-lang/gnat-gpl/files/gnat-gpl.xml
deleted file mode 100644
index 7d321e03b6a..00000000000
--- a/dev-lang/gnat-gpl/files/gnat-gpl.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" ?>
-<gprconfig>
- <compiler_description>
- <name>GNAT-@VER@</name>
- <executable prefix="1">gnatmake-@VER@</executable>
- <version>
- <external>${PREFIX}gnatls-@VER@ -v --version</external>
- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
- </version>
- <languages>Ada</languages>
- <variable name="gcc_version">
- <external>${PREFIX}gcc-@VER@ -v</external>
- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
- </variable>
- <runtimes default="default,kernel,native">
- <directory group="default"
>\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
- <directory group="default"
contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
- <directory group="2"
>\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
- <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
- </runtimes>
- <target>
- <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
- <grep regexp="[^\r\n]+"></grep>
- </target>
- </compiler_description>
-
- <configuration>
- <compilers>
- <compiler name="GNAT-@VER@" />
- </compilers>
- <config>
- package Naming is
- for Spec_Suffix ("Ada") use ".ads";
- for Body_Suffix ("Ada") use ".adb";
- for Casing use "lowercase";
- for Dot_Replacement use "-";
- end Naming;
-
- 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");
- 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@");
- end Binder;
-
- package Clean is
- for Source_Artifact_Extensions ("Ada")
- use (".dg", ".rep", ".stdout", ".stderr");
- for Object_Artifact_Extensions ("Ada") use (".s", ".ci", ".gcno");
- end Clean;
-
- for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
- for Runtime_Library_Dir ("Ada") use "${RUNTIME_DIR(ada)}/adalib/";
- for Runtime_Source_Dirs ("Ada") use ("${RUNTIME_DIR(ada)}/adainclude/");
- for Library_Encapsulated_Supported use "true";
- </config>
- </configuration>
-</gprconfig>
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
index 5f8e52f2347..8ad45cb76a1 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@@ -94,8 +94,6 @@ src_unpack() {
}
src_prepare() {
- sed -e "s:@VER@:${TOOLCHAIN_GCC_PV}:g" "${FILESDIR}"/${PN}.xml >
${P}.xml
-
mv ../gnat-gpl-${PV}-src/src/ada gcc/ || die
mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die
@@ -153,8 +151,6 @@ src_compile() {
}
src_install() {
- insinto /usr/share/gprconfig
- doins ${P}.xml
toolchain_src_install
cd "${D}"${BINPATH}
for x in gnat*; do
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
index 2dc7360a8d3..a050c6bba30 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
@@ -82,8 +82,6 @@ src_unpack() {
}
src_prepare() {
- sed -e "s:@VER@:${TOOLCHAIN_GCC_PV}:g" "${FILESDIR}"/${PN}.xml >
${P}.xml
-
CC=${GCC}
CXX="${gnatbase/gcc/g++}"
GNATBIND="${gnatbase/gcc/gnatbind}"
@@ -138,8 +136,6 @@ src_compile() {
}
src_install() {
- insinto /usr/share/gprconfig
- doins ${P}.xml
toolchain_src_install
cd "${D}"${BINPATH}
for x in gnat*; do
