From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- dev-ada/gprbuild/Manifest | 7 +- 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 --------------- dev-ada/gprbuild/gprbuild-2021-r1.ebuild | 9 +- 5 files changed, 6 insertions(+), 311 deletions(-) delete mode 100644 dev-ada/gprbuild/files/gprbuild-2017-config.patch delete mode 100644 dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch delete mode 100644 dev-ada/gprbuild/gprbuild-2017-r2.ebuild (limited to 'dev-ada/gprbuild') diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 08563aaf70fe..cdd423577356 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,15 +1,10 @@ -AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886 -AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66 AUX gprbuild-2020-gentoo.patch 11688 BLAKE2B 698f203f1a4b6086b1cc20300506db4d10e62bbade354891404fb8ac1e828370992e6e85cdb6777c6d1ae5831a2a65a1f7483ccb8a3b065c83233162055c1c8d SHA512 ec9c99db6fcd26b6971754dbab9187e6589a1bbc2e513cb205b37519c21296a91678aac09833839256cd6558d9e228878e63e264658b32b1b9403e40a61f02ab AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e 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 -EBUILD gprbuild-2017-r2.ebuild 1973 BLAKE2B 2cdba6aff85b0a25010e66c442a26e8f36e0c4007e6053205a21912cc99cf079c1035a291c8744a89cbe67b57953ee925f4463edf27c2c63a9438ae083d66d6d SHA512 af9505dc527d335e4dab40d8c532a886c008ee80ebfd00a190af91f828aa43dbb1fe8e9bec61070ac950d4fb9d232db4eb2a290ee626aeab42dd2040d7e206d8 EBUILD gprbuild-2020-r1.ebuild 1944 BLAKE2B 89f815aa6ae31ecb34a58cadb246bd29f20c871b074b30b32999f57991e47346dead6133aeb2e61fcd3927cf775f752caec99f76070fe66806a8a3221673b8fd SHA512 624ad556d9c9349c983358032ba3b5a221104e462401e8c23776cb26318201ed2e9508d7e4cddbebfe8cbd8870d5e010f14205f6b02d130d79fee860ac8af626 EBUILD gprbuild-2020.ebuild 1933 BLAKE2B ef95a4e2a94b502bbde2ea536ed846534fafc8ed0bc5138501118b668db31968019f61a523a250bfbc5207f1de79a99b9db2852a87b118a984d4685cf6dcc366 SHA512 5d2fcc275366e0408e2dbb14ef31ae00e6222610a98056376cf57f53f47b84725142352442fcf2c37c09bae05f78ba4bee347fed9b1b67349c2520ced36f35bf -EBUILD gprbuild-2021-r1.ebuild 1936 BLAKE2B 4fbb1abf8a152b8445bfe5cb1edbc53c1170df567a8dcff4438a2a0dedf973712889edc1782257abeb2ea71dc438ee989c869df4d208a3625defcb4c39329729 SHA512 2dc2a557f718c8d94e261c85eda389182d64c3e2beb20307ecab60378d71bb1ee759753700640c0118008ef11c7974681458f6f4b66c7535be176e84f289b472 +EBUILD gprbuild-2021-r1.ebuild 1956 BLAKE2B 19aec91243c1ee1de85ccf48e8d8da76bd54124de5c7cfe9bd3cd4d19ccdeb4f2327a54ca0b53c70ac499d6b18446ce95bce0ff4b3ea71a11e746c886577e8fc SHA512 713afaeeda52d4917cf252dd93018d80608729ac5b86544816cfd19dbfbf29430694dc9acb766da50bb704860550acfe265d66245474ad737b58f87fe8b4700d MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f 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 5dcd58ffb21d..000000000000 --- 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 -- (.*-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 -+ (.*-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@ - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - - C - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - -@@ -325,14 +325,14 @@ - --> - - GNAT -- (.*-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 -+ (.*-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@ - -- ${PREFIX}gnatls -v --version -+ ${PREFIX}gnatls-@VER@ -v --version - - - Ada - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - -@@ -342,7 +342,7 @@ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - -@@ -509,21 +509,6 @@ - - - -- -- -- LLVM -- clang -- -- clang -v -- -- -- C -- -- clang -dumpmachine -- -- -- -- - - - WINDRES ---- 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; - - 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 @@ - - - package Compiler is -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; - end Compiler; - - ---- 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; - - -@@ -830,7 +830,7 @@ - - - -- 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"); - - - 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 3f74f808e0ac..000000000000 --- 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 4b54ddf99782..000000000000 --- 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 -} diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild index 02f4c0558a5c..47c4d46d14f8 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild @@ -8,15 +8,16 @@ ADA_COMPAT=( gnat_202{0..1} ) inherit ada toolchain-funcs multiprocessing MYP=${P}-${PV}0519-19A34-src +ID=23a77a37247ff811609e23a0a271f445c299fc8f XMLADA=xmlada-${PV}-${PV}0518-19D50-src +XMLADAID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79 +ADAMIRROR=https://community.download.adacore.com/v1 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" + ${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz + ${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -- cgit v1.2.3