commit: bc872e0005084c5c0262d239efc504a2b75c16fd
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 13:30:42 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 13:30:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc872e00
dev-ada/gprbuild: drop gnat_2016
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-2017-config.patch | 122 ----------------------
dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 94 -----------------
dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 85 ---------------
4 files changed, 303 deletions(-)
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index b1f5e6eda06..b5542ae5b4d 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,6 +1,4 @@
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-2017-config.patch
b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
deleted file mode 100644
index 5dcd58ffb21..00000000000
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- a/share/gprconfig/compilers.xml 2018-10-27 09:04:53.830077299 +0200
-+++ b/share/gprconfig/compilers.xml 2018-10-27 09:05:14.883724079 +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-|.*-pc-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-|.*-pc-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>
-@@ -325,14 +325,14 @@
- -->
- <compiler_description>
- <name>GNAT</name>
-- <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls</executable>
-+ <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?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>
- <variable name="gcc_version">
-- <external>${PREFIX}gcc -v</external>
-+ <external>${PREFIX}gcc-@VER@ -v</external>
- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
- </variable>
- <runtimes default="default,kernel,native">
-@@ -342,7 +342,7 @@
- <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>
-@@ -509,21 +509,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</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 2018-10-27 09:38:31.615357671 +0200
-+++ b/share/gprconfig/gnat.xml 2018-10-27 09:40:54.603044560 +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 2018-10-27 09:42:01.327035277 +0200
-+++ b/share/gprconfig/c.xml 2018-10-27 09:42:16.529803718 +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 2018-10-27 09:43:17.934862859 +0200
-+++ b/share/gprconfig/linker.xml 2018-10-27 09:43:54.127304471 +0200
-@@ -814,7 +814,7 @@
- when "arm-android" | "arm-linux-androideabi" =>
- null;
- when others =>
-- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc",
"-nostdlib", "-Wl,-r", "-o");
-+ for Library_Partial_Linker use
("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
- end case;
- </config>
- </configuration>
-@@ -830,7 +830,7 @@
- <target name="^.*linux.*$" />
- </targets>
- <config>
-- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc",
"-nostdlib", "-Wl,-r", "-o");
-+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@",
"-nostdlib", "-Wl,-r", "-no-pie", "-o");
- </config>
- </configuration>
-
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
deleted file mode 100644
index 3f74f808e0a..00000000000
--- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- gprbuild-2017/gpr/gpr.gpr.old 2017-05-27 20:59:07.061135892 +0200
-+++ gprbuild-2017/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200
-@@ -67,6 +67,7 @@
- for Switches ("gpr*.ad?") use
- Compiler'Default_Switches ("Ada") & ("-g1");
- end case;
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- end GPR;
---- gprbuild-17.0/src/gprbuild-post_compile.adb.old 2017-05-18
14:17:06.114797015 +0200
-+++ gprbuild-17.0/src/gprbuild-post_compile.adb 2017-05-18
14:18:55.466956852 +0200
-@@ -4744,7 +4744,9 @@
- No_Create => Proj.Is_Aggregated);
- end if;
-
-- Shared_Libs := not Is_Static (Proj.Proj);
-+ if not Is_Static (Proj.Proj) then
-+ Shared_Libs := True;
-+ end if;
-
- end if;
- 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");
---- gprbuild-gpl-2017/src/gprlib.adb.old 2017-12-18 12:20:02.937317216
+0100
-+++ gprbuild-gpl-2017/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100
-@@ -400,7 +400,7 @@
-
- Driver_Name : Name_Id := No_Name;
-
-- Gnatbind_Name : String_Access := new String'("gnatbind");
-+ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
-
- Gnatbind_Path : String_Access;
-
-@@ -2237,13 +2237,13 @@
- and then Line (Last - 2 .. Last) = "gcc"
- then
- Gnatbind_Name :=
-- new String'(Line (1 .. Last - 3) & "gnatbind");
-+ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
-
- elsif Last > 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@");
- end if;
- end if;
-
diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
deleted file mode 100644
index 4b54ddf9978..00000000000
--- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{6,7} )
-
-inherit ada toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/";
-SRC_URI="
- http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
- -> ${MYP}-src.tar.gz
- http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
- -> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${ADA_DEPS}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-config.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
- if use ada_target_gnat_2016; then
- sed -i \
- -e 's:"-no-pie", ::g' \
- share/gprconfig/linker.xml \
- || die
- fi
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
- 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 \
- -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
-}
