Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
Date: Sun, 30 May 2021 13:54:36
Message-Id: 1622382861.ae86b692a753c84529aa35c07f435a2621cb9128.tupone@gentoo
1 commit: ae86b692a753c84529aa35c07f435a2621cb9128
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 30 13:54:21 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sun May 30 13:54:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae86b692
7
8 dev-ada/gprbuild: bump to 2021
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 dev-ada/gprbuild/Manifest | 2 +
14 dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 286 ++++++++++++++++++++++
15 dev-ada/gprbuild/gprbuild-2021.ebuild | 76 ++++++
16 3 files changed, 364 insertions(+)
17
18 diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
19 index 3ee032d60e9..b1f5e6eda06 100644
20 --- a/dev-ada/gprbuild/Manifest
21 +++ b/dev-ada/gprbuild/Manifest
22 @@ -1,4 +1,6 @@
23 DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
24 +DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
25 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
26 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
27 +DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
28 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
29
30 diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
31 new file mode 100644
32 index 00000000000..ac61f561785
33 --- /dev/null
34 +++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
35 @@ -0,0 +1,286 @@
36 +--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200
37 ++++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200
38 +@@ -266,7 +266,9 @@
39 +
40 + Driver_Name : Name_Id := No_Name;
41 +
42 +- Gnatbind_Name : String_Access := new String'("gnatbind");
43 ++ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
44 ++
45 ++ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
46 +
47 + Compiler_Name : String_Access := new String'("gcc");
48 +
49 +@@ -2081,7 +2083,7 @@
50 + and then Line (Last - 2 .. Last) = "gcc"
51 + then
52 + Gnatbind_Name :=
53 +- new String'(Line (1 .. Last - 3) & "gnatbind");
54 ++ new String'(Line (1 .. Last - 3) & "@GNATBIND@");
55 + Objcopy_Name :=
56 + new String'(Line (1 .. Last - 3) & "objcopy");
57 +
58 +@@ -2089,7 +2091,7 @@
59 + and then Line (Last - 6 .. Last) = "gcc.exe"
60 + then
61 + Gnatbind_Name :=
62 +- new String'(Line (1 .. Last - 7) & "gnatbind");
63 ++ new String'(Line (1 .. Last - 7) & "@GNATBIND@");
64 + Objcopy_Name :=
65 + new String'(Line (1 .. Last - 7) & "objcopy");
66 + end if;
67 +@@ -2241,7 +2243,13 @@
68 + Mapping_File_Name := new String'(Line (1 .. Last));
69 +
70 + when Binding_Options =>
71 +- Binding_Options_Table.Append (Line (1 .. Last));
72 ++ if Last > Gnatbind_Path_Option'Length
73 ++ and then Line (1 .. Gnatbind_Path_Option'Length) =
74 ++ Gnatbind_Path_Option then
75 ++ null;
76 ++ else
77 ++ Binding_Options_Table.Append (Line (1 .. Last));
78 ++ end if;
79 +
80 + when Copy_Source_Dir =>
81 + Copy_Source_Directory := new String'(Line (1 .. Last));
82 +--- a/share/gprconfig/compilers.xml 2019-06-01 21:29:57.611722804 +0200
83 ++++ b/share/gprconfig/compilers.xml 2019-06-01 21:42:56.000608601 +0200
84 +@@ -20,15 +20,15 @@
85 + <!-- GCC 3.x & 4.x (not for GNAT Pro)-->
86 + <compiler_description>
87 + <name>GCC</name>
88 +- <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>
89 ++ <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>
90 + <version>
91 +- <external>${PREFIX}gcc -v</external>
92 ++ <external>${PREFIX}gcc-@VER@ -v</external>
93 + <nogrep regexp="for GNAT Pro"></nogrep>
94 + <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
95 + </version>
96 + <languages>C</languages>
97 + <target>
98 +- <external>${PREFIX}gcc -dumpmachine</external>
99 ++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
100 + <grep regexp="[^\r\n]+"></grep>
101 + </target>
102 + </compiler_description>
103 +@@ -185,9 +185,9 @@
104 + -->
105 + <compiler_description>
106 + <name>GNAT</name>
107 +- <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>
108 ++ <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>
109 + <version>
110 +- <external>${PREFIX}gnatls -v --version</external>
111 ++ <external>${PREFIX}gnatls-@VER@ -v --version</external>
112 + <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
113 + </version>
114 + <languages>Ada</languages>
115 +@@ -202,68 +202,11 @@
116 + <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
117 + </runtimes>
118 + <target>
119 +- <external>${PREFIX}gcc -dumpmachine</external>
120 ++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
121 + <grep regexp="[^\r\n]+"></grep>
122 + </target>
123 + </compiler_description>
124 +
125 +- <!-- CodePeer -->
126 +-
127 +- <compiler_description>
128 +- <name>GNAT_CODEPEER</name>
129 +- <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
130 +- <version>
131 +- <external>${PREFIX}gnatls -v</external>
132 +- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
133 +- </version>
134 +- <languages>Ada,C,C++</languages>
135 +- <variable name="gcc_version">
136 +- <external>${PREFIX}gcc -v</external>
137 +- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
138 +- </variable>
139 +- <runtimes default="default,native">
140 +- <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
141 +- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
142 +- <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
143 +- </runtimes>
144 +- <target>codepeer</target>
145 +- </compiler_description>
146 +-
147 +- <!-- Generic GNAT LLVM Target -->
148 +-
149 +- <compiler_description>
150 +- <name>GNAT_LLVM</name>
151 +- <executable prefix="1">(llvm-)gnatls</executable>
152 +- <version>
153 +- <external>${PREFIX}gnatls -v</external>
154 +- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
155 +- </version>
156 +- <languages>Ada</languages>
157 +- <variable name="gcc_version">
158 +- <external>${PREFIX}gcc -v</external>
159 +- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
160 +- </variable>
161 +- <runtimes default="default,native">
162 +- <directory group="default" >\.\./lib/rts-native/adalib/</directory>
163 +- <directory group="1" >\.\./lib/rts-(.*)/adalib/</directory>
164 +- </runtimes>
165 +- <target>llvm</target>
166 +- </compiler_description>
167 +-
168 +- <!-- Generic C compiler for LLVM -->
169 +- <compiler_description>
170 +- <name>C_LLVM</name>
171 +- <executable>clang</executable>
172 +- <version>
173 +- <external>clang --version</external>
174 +-
175 +- <!-- '...clang version 6.0.0...' -->
176 +- <grep regexp="clang version (\S+)" group="1"></grep>
177 +- </version>
178 +- <languages>C</languages>
179 +- <target>llvm</target>
180 +- </compiler_description>
181 +-
182 + <!-- Generic C++ compiler for LLVM -->
183 + <compiler_description>
184 + <name>C++_LLVM</name>
185 +@@ -221,28 +221,6 @@
186 + <target>llvm</target>
187 + </compiler_description>
188 +
189 +- <!-- C Target -->
190 +-
191 +- <compiler_description>
192 +- <name>GNAT_C</name>
193 +- <executable prefix="1">(c-)gnatls</executable>
194 +- <version>
195 +- <external>${PREFIX}gnatls -v</external>
196 +- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
197 +- </version>
198 +- <languages>Ada</languages>
199 +- <variable name="gcc_version">
200 +- <external>${PREFIX}gcc -v</external>
201 +- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
202 +- </variable>
203 +- <runtimes default="default,ccg">
204 +- <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
205 +- <directory group="1" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
206 +- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
207 +- </runtimes>
208 +- <target>c</target>
209 +- </compiler_description>
210 +-
211 + <!-- CCG Target (C generation via LLVM) -->
212 +
213 + <compiler_description>
214 +@@ -286,23 +264,6 @@
215 + </compiler_description>
216 +
217 +
218 +- <!-- GNAT_DOTNET -->
219 +-
220 +- <compiler_description>
221 +- <name>GNAT_DOTNET</name>
222 +- <executable prefix="1">(.*dotnet-)gnatls</executable>
223 +- <version>
224 +- <external>${PREFIX}gnatls -v</external>
225 +- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
226 +- </version>
227 +- <languages>Ada</languages>
228 +- <runtimes default="default,kernel">
229 +- <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
230 +- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
231 +- </runtimes>
232 +- <target>dotnet</target>
233 +- </compiler_description>
234 +-
235 + <!-- JGNAT -->
236 +
237 + <compiler_description>
238 +@@ -421,21 +326,6 @@
239 + </target>
240 + </compiler_description>
241 +
242 +- <!-- LLVM Compiler -->
243 +- <compiler_description>
244 +- <name>LLVM</name>
245 +- <executable>clang</executable>
246 +- <version>
247 +- <external>clang -v</external>
248 +- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
249 +- </version>
250 +- <languages>C,C++</languages>
251 +- <target>
252 +- <external>clang -dumpmachine</external>
253 +- <grep regexp="[^\r\n]+"></grep>
254 +- </target>
255 +- </compiler_description>
256 +-
257 + <!-- Windres compiler -->
258 + <compiler_description>
259 + <name>WINDRES</name>
260 +--- a/share/gprconfig/gnat.xml 2019-06-01 21:53:53.383281607 +0200
261 ++++ b/share/gprconfig/gnat.xml 2019-06-01 21:57:08.414196529 +0200
262 +@@ -60,7 +60,7 @@
263 + &filter_gnat;
264 + <config>
265 + package Compiler is
266 +- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
267 ++ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
268 + for Language_Kind ("Ada") use "unit_based";
269 + for Dependency_Kind ("Ada") use "ALI_File";
270 + for Leading_Required_Switches ("Ada") use
271 +@@ -77,6 +77,9 @@
272 + for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE";
273 + for Driver ("Ada") use
274 + "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
275 ++ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
276 ++ for Required_Switches ("Ada") use
277 ++ Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
278 + end Binder;
279 +
280 + for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
281 +--- a/share/gprconfig/c.xml 2019-06-01 21:57:36.244755708 +0200
282 ++++ b/share/gprconfig/c.xml 2019-06-01 21:59:14.919191663 +0200
283 +@@ -14,7 +14,7 @@
284 + </compilers>
285 + <config>
286 + package Compiler is
287 +- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
288 ++ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
289 + end Compiler;
290 + </config>
291 + </configuration>
292 +--- a/share/gprconfig/linker.xml 2019-06-01 21:59:34.546880368 +0200
293 ++++ b/share/gprconfig/linker.xml 2019-06-01 22:00:50.906668730 +0200
294 +@@ -112,6 +112,9 @@
295 + for Object_Lister use ("nm", "-g");
296 + for Object_Lister_Matcher use " [TDRB] (.*)";
297 +
298 ++ LDFLAGS := External_As_List ("LDFLAGS", " ");
299 ++ for Leading_Library_Options use LDFLAGS;
300 ++
301 + package Linker is
302 + for Export_File_Format use "GNU";
303 + for Export_File_Switch use "-Wl,--version-script=";
304 +@@ -1211,7 +1211,7 @@
305 + </targets>
306 + <config>
307 + for Library_Partial_Linker use
308 +- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib")
309 ++ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib")
310 + &amp; GCC_No_Pie
311 + &amp; ("-Wl,-r", "-o");
312 + </config>
313 +@@ -1232,7 +1232,7 @@
314 + </targets>
315 + <config>
316 + for Library_Partial_Linker use
317 +- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib")
318 ++ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib")
319 + &amp; GCC_No_Pie
320 + &amp; ("-Wl,-r", "-o");
321 + </config>
322
323 diff --git a/dev-ada/gprbuild/gprbuild-2021.ebuild b/dev-ada/gprbuild/gprbuild-2021.ebuild
324 new file mode 100644
325 index 00000000000..02f4c0558a5
326 --- /dev/null
327 +++ b/dev-ada/gprbuild/gprbuild-2021.ebuild
328 @@ -0,0 +1,76 @@
329 +# Copyright 1999-2021 Gentoo Authors
330 +# Distributed under the terms of the GNU General Public License v2
331 +
332 +EAPI=7
333 +
334 +ADA_COMPAT=( gnat_202{0..1} )
335 +
336 +inherit ada toolchain-funcs multiprocessing
337 +
338 +MYP=${P}-${PV}0519-19A34-src
339 +XMLADA=xmlada-${PV}-${PV}0518-19D50-src
340 +
341 +DESCRIPTION="Multi-Language Management"
342 +HOMEPAGE="http://libre.adacore.com/"
343 +SRC_URI="
344 + https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=${MYP}.tar.gz
345 + -> ${MYP}.tar.gz
346 + https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=${XMLADA}.tar.gz
347 + -> ${XMLADA}.tar.gz"
348 +LICENSE="GPL-3"
349 +SLOT="0"
350 +KEYWORDS="~amd64 ~x86"
351 +IUSE=""
352 +
353 +DEPEND="${ADA_DEPS}"
354 +RDEPEND="${DEPEND}"
355 +
356 +S="${WORKDIR}"/${MYP}
357 +
358 +REQUIRED_USE="${ADA_REQUIRED_USE}"
359 +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
360 +
361 +src_prepare() {
362 + default
363 + sed -i \
364 + -e "s:@VER@:${GCC_PV}:g" \
365 + share/gprconfig/compilers.xml \
366 + share/gprconfig/gnat.xml \
367 + share/gprconfig/c.xml \
368 + share/gprconfig/linker.xml \
369 + || die
370 + sed -i \
371 + -e "s:@GNATBIND@:${GNATBIND}:g" \
372 + src/gprlib.adb \
373 + || die
374 +}
375 +
376 +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
377 +lib_progs="gprlib gprbind"
378 +
379 +src_compile() {
380 + local xmlada_src="../${XMLADA}"
381 + incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
382 + -I${xmlada_src}/schema -I${xmlada_src}/unicode \
383 + -I${xmlada_src}/input_sources"
384 + gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
385 + for bin in ${bin_progs}; do
386 + gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
387 + -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
388 + done
389 + for lib in $lib_progs; do
390 + gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
391 + -largs ${LDFLAGS} gpr_imports.o || die
392 + done
393 +}
394 +
395 +src_install() {
396 + dobin ${bin_progs}
397 + exeinto /usr/libexec/gprbuild
398 + doexe ${lib_progs}
399 + insinto /usr/share/gprconfig
400 + doins share/gprconfig/*
401 + insinto /usr/share/gpr
402 + doins share/_default.gpr
403 + einstalldocs
404 +}