commit: ae86b692a753c84529aa35c07f435a2621cb9128
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 13:54:21 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun May 30 13:54:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae86b692
dev-ada/gprbuild: bump to 2021
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gprbuild/Manifest | 2 +
dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 286 ++++++++++++++++++++++
dev-ada/gprbuild/gprbuild-2021.ebuild | 76 ++++++
3 files changed, 364 insertions(+)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 3ee032d60e9..b1f5e6eda06 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,4 +1,6 @@
DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B
3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a
SHA512
d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
+DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B
42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997
SHA512
f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B
e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147
SHA512
e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
+DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B
589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35
SHA512
e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B
7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81
SHA512
371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
new file mode 100644
index 00000000000..ac61f561785
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
@@ -0,0 +1,286 @@
+--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200
++++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200
+@@ -266,7 +266,9 @@
+
+ Driver_Name : Name_Id := No_Name;
+
+- Gnatbind_Name : String_Access := new String'("gnatbind");
++ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
++
++ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
+
+ Compiler_Name : String_Access := new String'("gcc");
+
+@@ -2081,7 +2083,7 @@
+ and then Line (Last - 2 .. Last) = "gcc"
+ then
+ Gnatbind_Name :=
+- new String'(Line (1 .. Last - 3) & "gnatbind");
++ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
+ Objcopy_Name :=
+ new String'(Line (1 .. Last - 3) & "objcopy");
+
+@@ -2089,7 +2091,7 @@
+ and then Line (Last - 6 .. Last) = "gcc.exe"
+ then
+ Gnatbind_Name :=
+- new String'(Line (1 .. Last - 7) & "gnatbind");
++ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
+ Objcopy_Name :=
+ new String'(Line (1 .. Last - 7) & "objcopy");
+ end if;
+@@ -2241,7 +2243,13 @@
+ Mapping_File_Name := new String'(Line (1 .. Last));
+
+ when Binding_Options =>
+- Binding_Options_Table.Append (Line (1 .. Last));
++ if Last > Gnatbind_Path_Option'Length
++ and then Line (1 .. Gnatbind_Path_Option'Length) =
++ Gnatbind_Path_Option then
++ null;
++ else
++ Binding_Options_Table.Append (Line (1 .. Last));
++ end if;
+
+ when Copy_Source_Dir =>
+ Copy_Source_Directory := new String'(Line (1 .. Last));
+--- a/share/gprconfig/compilers.xml 2019-06-01 21:29:57.611722804 +0200
++++ b/share/gprconfig/compilers.xml 2019-06-01 21:42:56.000608601 +0200
+@@ -20,15 +20,15 @@
+ <!-- GCC 3.x & 4.x (not for GNAT Pro)-->
+ <compiler_description>
+ <name>GCC</name>
+- <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
++ <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
+ <version>
+- <external>${PREFIX}gcc -v</external>
++ <external>${PREFIX}gcc-@VER@ -v</external>
+ <nogrep regexp="for GNAT Pro"></nogrep>
+ <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
+ </version>
+ <languages>C</languages>
+ <target>
+- <external>${PREFIX}gcc -dumpmachine</external>
++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+ <grep regexp="[^\r\n]+"></grep>
+ </target>
+ </compiler_description>
+@@ -185,9 +185,9 @@
+ -->
+ <compiler_description>
+ <name>GNAT</name>
+- <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable>
++ <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@</executable>
+ <version>
+- <external>${PREFIX}gnatls -v --version</external>
++ <external>${PREFIX}gnatls-@VER@ -v --version</external>
+ <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+ </version>
+ <languages>Ada</languages>
+@@ -202,68 +202,11 @@
+ <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
+ </runtimes>
+ <target>
+- <external>${PREFIX}gcc -dumpmachine</external>
++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
+ <grep regexp="[^\r\n]+"></grep>
+ </target>
+ </compiler_description>
+
+- <!-- CodePeer -->
+-
+- <compiler_description>
+- <name>GNAT_CODEPEER</name>
+- <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
+- <version>
+- <external>${PREFIX}gnatls -v</external>
+- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+- </version>
+- <languages>Ada,C,C++</languages>
+- <variable name="gcc_version">
+- <external>${PREFIX}gcc -v</external>
+- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+- </variable>
+- <runtimes default="default,native">
+- <directory group="default"
>\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
+- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
+- <directory group="1"
>\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
+- </runtimes>
+- <target>codepeer</target>
+- </compiler_description>
+-
+- <!-- Generic GNAT LLVM Target -->
+-
+- <compiler_description>
+- <name>GNAT_LLVM</name>
+- <executable prefix="1">(llvm-)gnatls</executable>
+- <version>
+- <external>${PREFIX}gnatls -v</external>
+- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+- </version>
+- <languages>Ada</languages>
+- <variable name="gcc_version">
+- <external>${PREFIX}gcc -v</external>
+- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+- </variable>
+- <runtimes default="default,native">
+- <directory group="default" >\.\./lib/rts-native/adalib/</directory>
+- <directory group="1" >\.\./lib/rts-(.*)/adalib/</directory>
+- </runtimes>
+- <target>llvm</target>
+- </compiler_description>
+-
+- <!-- Generic C compiler for LLVM -->
+- <compiler_description>
+- <name>C_LLVM</name>
+- <executable>clang</executable>
+- <version>
+- <external>clang --version</external>
+-
+- <!-- '...clang version 6.0.0...' -->
+- <grep regexp="clang version (\S+)" group="1"></grep>
+- </version>
+- <languages>C</languages>
+- <target>llvm</target>
+- </compiler_description>
+-
+ <!-- Generic C++ compiler for LLVM -->
+ <compiler_description>
+ <name>C++_LLVM</name>
+@@ -221,28 +221,6 @@
+ <target>llvm</target>
+ </compiler_description>
+
+- <!-- C Target -->
+-
+- <compiler_description>
+- <name>GNAT_C</name>
+- <executable prefix="1">(c-)gnatls</executable>
+- <version>
+- <external>${PREFIX}gnatls -v</external>
+- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+- </version>
+- <languages>Ada</languages>
+- <variable name="gcc_version">
+- <external>${PREFIX}gcc -v</external>
+- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
+- </variable>
+- <runtimes default="default,ccg">
+- <directory group="default"
>\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
+- <directory group="1"
>\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
+- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
+- </runtimes>
+- <target>c</target>
+- </compiler_description>
+-
+ <!-- CCG Target (C generation via LLVM) -->
+
+ <compiler_description>
+@@ -286,23 +264,6 @@
+ </compiler_description>
+
+
+- <!-- GNAT_DOTNET -->
+-
+- <compiler_description>
+- <name>GNAT_DOTNET</name>
+- <executable prefix="1">(.*dotnet-)gnatls</executable>
+- <version>
+- <external>${PREFIX}gnatls -v</external>
+- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
+- </version>
+- <languages>Ada</languages>
+- <runtimes default="default,kernel">
+- <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
+- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
+- </runtimes>
+- <target>dotnet</target>
+- </compiler_description>
+-
+ <!-- JGNAT -->
+
+ <compiler_description>
+@@ -421,21 +326,6 @@
+ </target>
+ </compiler_description>
+
+- <!-- LLVM Compiler -->
+- <compiler_description>
+- <name>LLVM</name>
+- <executable>clang</executable>
+- <version>
+- <external>clang -v</external>
+- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
+- </version>
+- <languages>C,C++</languages>
+- <target>
+- <external>clang -dumpmachine</external>
+- <grep regexp="[^\r\n]+"></grep>
+- </target>
+- </compiler_description>
+-
+ <!-- Windres compiler -->
+ <compiler_description>
+ <name>WINDRES</name>
+--- a/share/gprconfig/gnat.xml 2019-06-01 21:53:53.383281607 +0200
++++ b/share/gprconfig/gnat.xml 2019-06-01 21:57:08.414196529 +0200
+@@ -60,7 +60,7 @@
+ &filter_gnat;
+ <config>
+ package Compiler is
+- for Driver ("Ada") use
"${PATH(ada)}${PREFIX(ada)}gcc";
++ 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
+@@ -77,6 +77,9 @@
+ 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)}";
+--- a/share/gprconfig/c.xml 2019-06-01 21:57:36.244755708 +0200
++++ b/share/gprconfig/c.xml 2019-06-01 21:59:14.919191663 +0200
+@@ -14,7 +14,7 @@
+ </compilers>
+ <config>
+ package Compiler is
+- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
++ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
+ end Compiler;
+ </config>
+ </configuration>
+--- a/share/gprconfig/linker.xml 2019-06-01 21:59:34.546880368 +0200
++++ b/share/gprconfig/linker.xml 2019-06-01 22:00:50.906668730 +0200
+@@ -112,6 +112,9 @@
+ for Object_Lister use ("nm", "-g");
+ for Object_Lister_Matcher use " [TDRB] (.*)";
+
++ LDFLAGS := External_As_List ("LDFLAGS", " ");
++ for Leading_Library_Options use LDFLAGS;
++
+ package Linker is
+ for Export_File_Format use "GNU";
+ for Export_File_Switch use "-Wl,--version-script=";
+@@ -1211,7 +1211,7 @@
+ </targets>
+ <config>
+ for Library_Partial_Linker use
+- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib")
++ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib")
+ & GCC_No_Pie
+ & ("-Wl,-r", "-o");
+ </config>
+@@ -1232,7 +1232,7 @@
+ </targets>
+ <config>
+ for Library_Partial_Linker use
+- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib")
++ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib")
+ & GCC_No_Pie
+ & ("-Wl,-r", "-o");
+ </config>
diff --git a/dev-ada/gprbuild/gprbuild-2021.ebuild
b/dev-ada/gprbuild/gprbuild-2021.ebuild
new file mode 100644
index 00000000000..02f4c0558a5
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2021.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0..1} )
+
+inherit ada toolchain-funcs multiprocessing
+
+MYP=${P}-${PV}0519-19A34-src
+XMLADA=xmlada-${PV}-${PV}0518-19D50-src
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/";
+SRC_URI="
+
https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=${MYP}.tar.gz
+ -> ${MYP}.tar.gz
+
https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=${XMLADA}.tar.gz
+ -> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${ADA_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s:@VER@:${GCC_PV}:g" \
+ share/gprconfig/compilers.xml \
+ share/gprconfig/gnat.xml \
+ share/gprconfig/c.xml \
+ share/gprconfig/linker.xml \
+ || die
+ sed -i \
+ -e "s:@GNATBIND@:${GNATBIND}:g" \
+ src/gprlib.adb \
+ || die
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+ local xmlada_src="../${XMLADA}"
+ 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"
+ gcc -c ${CFLAGS} gpr/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 ${LDFLAGS} gpr_imports.o || die
+ done
+ for lib in $lib_progs; do
+ gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+ -largs ${LDFLAGS} gpr_imports.o || die
+ done
+}
+
+src_install() {
+ dobin ${bin_progs}
+ exeinto /usr/libexec/gprbuild
+ doexe ${lib_progs}
+ insinto /usr/share/gprconfig
+ doins share/gprconfig/*
+ insinto /usr/share/gpr
+ doins share/_default.gpr
+ einstalldocs
+}
