1 |
commit: edbcf396d0d83b65977186af2a5c530e2b5df30a |
2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 24 20:25:31 2022 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 24 20:26:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbcf396 |
7 |
|
8 |
dev-ada/gprbuild: separate gprconfig_kb |
9 |
|
10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
11 |
|
12 |
dev-ada/gprbuild/Manifest | 1 - |
13 |
dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch | 47 ---- |
14 |
.../gprbuild/files/gprbuild-22.0.0-gentoo.patch | 246 --------------------- |
15 |
...-22.0.0-r2.ebuild => gprbuild-22.0.0-r3.ebuild} | 41 +--- |
16 |
4 files changed, 4 insertions(+), 331 deletions(-) |
17 |
|
18 |
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest |
19 |
index adc6ed460a2d..408939bb5cc6 100644 |
20 |
--- a/dev-ada/gprbuild/Manifest |
21 |
+++ b/dev-ada/gprbuild/Manifest |
22 |
@@ -1,5 +1,4 @@ |
23 |
DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 |
24 |
DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a |
25 |
-DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4 |
26 |
DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 |
27 |
DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e |
28 |
|
29 |
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch |
30 |
deleted file mode 100644 |
31 |
index ba5c2f858de7..000000000000 |
32 |
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch |
33 |
+++ /dev/null |
34 |
@@ -1,47 +0,0 @@ |
35 |
---- a/gpr/src/gpr_imports.c 2022-02-27 10:10:34.053638209 +0100 |
36 |
-+++ b/gpr/src/gpr_imports.c 2022-02-27 10:12:03.898276758 +0100 |
37 |
-@@ -114,6 +114,44 @@ |
38 |
- const char *__gnat_default_libgcc_subdir = "lib"; |
39 |
- #endif |
40 |
- |
41 |
-+#include <sys/types.h> |
42 |
-+#include <sys/stat.h> |
43 |
-+#include <limits.h> |
44 |
-+#include <unistd.h> |
45 |
-+ |
46 |
-+ extern long long __gnat_file_time(char* name) |
47 |
-+ { |
48 |
-+ long long result; |
49 |
-+ |
50 |
-+ if (name == NULL) { |
51 |
-+ return LLONG_MIN; |
52 |
-+ } |
53 |
-+ /* Number of seconds between <Jan 1st 1970> and <Jan 1st 2150>. */ |
54 |
-+ static const long long ada_epoch_offset = (136 * 365 + 44 * 366) * 86400LL; |
55 |
-+ struct stat sb; |
56 |
-+ if (stat(name, &sb) != 0) { |
57 |
-+ return LLONG_MIN; |
58 |
-+ } |
59 |
-+ |
60 |
-+ // return (sb.st_mtim.tv_sec - ada_epoch_offset) * 1E9 |
61 |
-+ // + sb.st_mtim.tv_nsec; |
62 |
-+ // with check overflow below |
63 |
-+ |
64 |
-+ if (__builtin_ssubll_overflow(sb.st_mtim.tv_sec, ada_epoch_offset, &result)) { |
65 |
-+ return LLONG_MIN; |
66 |
-+ } |
67 |
-+ |
68 |
-+ if (__builtin_smulll_overflow(result, 1E9, &result)) { |
69 |
-+ return LLONG_MIN; |
70 |
-+ } |
71 |
-+ |
72 |
-+ if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, &result)) { |
73 |
-+ return LLONG_MIN; |
74 |
-+ } |
75 |
-+ |
76 |
-+ return result; |
77 |
-+ } |
78 |
-+ |
79 |
- #ifdef __cplusplus |
80 |
- } |
81 |
- #endif |
82 |
|
83 |
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch |
84 |
index a974d18c4144..3decc264638e 100644 |
85 |
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch |
86 |
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch |
87 |
@@ -44,249 +44,3 @@ |
88 |
|
89 |
when Copy_Source_Dir => |
90 |
Copy_Source_Directory := new String'(Line (1 .. Last)); |
91 |
---- a/share/gprconfig/compilers.xml 2019-06-01 21:29:57.611722804 +0200 |
92 |
-+++ b/share/gprconfig/compilers.xml 2019-06-01 21:42:56.000608601 +0200 |
93 |
-@@ -20,15 +20,15 @@ |
94 |
- <!-- GCC 3.x & 4.x (not for GNAT Pro)--> |
95 |
- <compiler_description> |
96 |
- <name>GCC</name> |
97 |
-- <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> |
98 |
-+ <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> |
99 |
- <version> |
100 |
-- <external>${PREFIX}gcc -v</external> |
101 |
-+ <external>${PREFIX}gcc-@VER@ -v</external> |
102 |
- <nogrep regexp="for GNAT Pro"></nogrep> |
103 |
- <grep regexp="^gcc \S+ (\S+)" group="1"></grep> |
104 |
- </version> |
105 |
- <languages>C</languages> |
106 |
- <target> |
107 |
-- <external>${PREFIX}gcc -dumpmachine</external> |
108 |
-+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> |
109 |
- <grep regexp="[^\r\n]+"></grep> |
110 |
- </target> |
111 |
- </compiler_description> |
112 |
-@@ -185,14 +185,14 @@ |
113 |
- --> |
114 |
- <compiler_description> |
115 |
- <name>GNAT</name> |
116 |
-- <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.*|.*-rtems.*)?gnatls</executable> |
117 |
-+ <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.*|.*-rtems.*)?gnatls-@VER@</executable> |
118 |
- <version> |
119 |
-- <external>${PREFIX}gnatls -v --version</external> |
120 |
-+ <external>${PREFIX}gnatls-@VER@ -v --version</external> |
121 |
- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
122 |
- </version> |
123 |
- <languages>Ada</languages> |
124 |
- <variable name="gcc_version"> |
125 |
-- <external>${PREFIX}gcc -v</external> |
126 |
-+ <external>${PREFIX}gcc-@VER@ -v</external> |
127 |
- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
128 |
- </variable> |
129 |
- <runtimes default="default,kernel,native"> |
130 |
-@@ -202,68 +202,11 @@ |
131 |
- <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory> |
132 |
- </runtimes> |
133 |
- <target> |
134 |
-- <external>${PREFIX}gcc -dumpmachine</external> |
135 |
-+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> |
136 |
- <grep regexp="[^\r\n]+"></grep> |
137 |
- </target> |
138 |
- </compiler_description> |
139 |
- |
140 |
-- <!-- CodePeer --> |
141 |
-- |
142 |
-- <compiler_description> |
143 |
-- <name>GNAT_CODEPEER</name> |
144 |
-- <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable> |
145 |
-- <version> |
146 |
-- <external>${PREFIX}gnatls -v</external> |
147 |
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
148 |
-- </version> |
149 |
-- <languages>Ada,C,C++</languages> |
150 |
-- <variable name="gcc_version"> |
151 |
-- <external>${PREFIX}gcc -v</external> |
152 |
-- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
153 |
-- </variable> |
154 |
-- <runtimes default="default,native"> |
155 |
-- <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory> |
156 |
-- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory> |
157 |
-- <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory> |
158 |
-- </runtimes> |
159 |
-- <target>codepeer</target> |
160 |
-- </compiler_description> |
161 |
-- |
162 |
-- <!-- Generic GNAT LLVM Target --> |
163 |
-- |
164 |
-- <compiler_description> |
165 |
-- <name>GNAT_LLVM</name> |
166 |
-- <executable prefix="1">(llvm-)gnatls</executable> |
167 |
-- <version> |
168 |
-- <external>${PREFIX}gnatls -v</external> |
169 |
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
170 |
-- </version> |
171 |
-- <languages>Ada</languages> |
172 |
-- <variable name="gcc_version"> |
173 |
-- <external>${PREFIX}gcc -v</external> |
174 |
-- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
175 |
-- </variable> |
176 |
-- <runtimes default="default,native"> |
177 |
-- <directory group="default" >\.\./lib/rts-native/adalib/</directory> |
178 |
-- <directory group="1" >\.\./lib/rts-(.*)/adalib/</directory> |
179 |
-- </runtimes> |
180 |
-- <target>llvm</target> |
181 |
-- </compiler_description> |
182 |
-- |
183 |
-- <!-- Generic C compiler for LLVM --> |
184 |
-- <compiler_description> |
185 |
-- <name>C_LLVM</name> |
186 |
-- <executable>clang</executable> |
187 |
-- <version> |
188 |
-- <external>clang --version</external> |
189 |
-- |
190 |
-- <!-- '...clang version 6.0.0...' --> |
191 |
-- <grep regexp="clang version (\S+)" group="1"></grep> |
192 |
-- </version> |
193 |
-- <languages>C</languages> |
194 |
-- <target>llvm</target> |
195 |
-- </compiler_description> |
196 |
-- |
197 |
- <!-- Generic C++ compiler for LLVM --> |
198 |
- <compiler_description> |
199 |
- <name>C++_LLVM</name> |
200 |
-@@ -221,28 +221,6 @@ |
201 |
- <target>llvm</target> |
202 |
- </compiler_description> |
203 |
- |
204 |
-- <!-- C Target --> |
205 |
-- |
206 |
-- <compiler_description> |
207 |
-- <name>GNAT_C</name> |
208 |
-- <executable prefix="1">(c-)gnatls</executable> |
209 |
-- <version> |
210 |
-- <external>${PREFIX}gnatls -v</external> |
211 |
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
212 |
-- </version> |
213 |
-- <languages>Ada</languages> |
214 |
-- <variable name="gcc_version"> |
215 |
-- <external>${PREFIX}gcc -v</external> |
216 |
-- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
217 |
-- </variable> |
218 |
-- <runtimes default="default,ccg"> |
219 |
-- <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory> |
220 |
-- <directory group="1" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory> |
221 |
-- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory> |
222 |
-- </runtimes> |
223 |
-- <target>c</target> |
224 |
-- </compiler_description> |
225 |
-- |
226 |
- <!-- CCG Target (C generation via LLVM) --> |
227 |
- |
228 |
- <compiler_description> |
229 |
-@@ -286,23 +264,6 @@ |
230 |
- </compiler_description> |
231 |
- |
232 |
- |
233 |
-- <!-- GNAT_DOTNET --> |
234 |
-- |
235 |
-- <compiler_description> |
236 |
-- <name>GNAT_DOTNET</name> |
237 |
-- <executable prefix="1">(.*dotnet-)gnatls</executable> |
238 |
-- <version> |
239 |
-- <external>${PREFIX}gnatls -v</external> |
240 |
-- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
241 |
-- </version> |
242 |
-- <languages>Ada</languages> |
243 |
-- <runtimes default="default,kernel"> |
244 |
-- <directory group="default" >\.\./lib/dotgnat/adalib/</directory> |
245 |
-- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory> |
246 |
-- </runtimes> |
247 |
-- <target>dotnet</target> |
248 |
-- </compiler_description> |
249 |
-- |
250 |
- <!-- JGNAT --> |
251 |
- |
252 |
- <compiler_description> |
253 |
-@@ -421,21 +326,6 @@ |
254 |
- </target> |
255 |
- </compiler_description> |
256 |
- |
257 |
-- <!-- LLVM Compiler --> |
258 |
-- <compiler_description> |
259 |
-- <name>LLVM</name> |
260 |
-- <executable>clang</executable> |
261 |
-- <version> |
262 |
-- <external>clang -v</external> |
263 |
-- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep> |
264 |
-- </version> |
265 |
-- <languages>C,C++</languages> |
266 |
-- <target> |
267 |
-- <external>clang -dumpmachine</external> |
268 |
-- <grep regexp="[^\r\n]+"></grep> |
269 |
-- </target> |
270 |
-- </compiler_description> |
271 |
-- |
272 |
- <!-- Windres compiler --> |
273 |
- <compiler_description> |
274 |
- <name>WINDRES</name> |
275 |
---- a/share/gprconfig/gnat.xml 2019-06-01 21:53:53.383281607 +0200 |
276 |
-+++ b/share/gprconfig/gnat.xml 2019-06-01 21:57:08.414196529 +0200 |
277 |
-@@ -60,7 +60,7 @@ |
278 |
- &filter_gnat; |
279 |
- <config> |
280 |
- package Compiler is |
281 |
-- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; |
282 |
-+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; |
283 |
- for Language_Kind ("Ada") use "unit_based"; |
284 |
- for Dependency_Kind ("Ada") use "ALI_File"; |
285 |
- for Leading_Required_Switches ("Ada") use |
286 |
-@@ -77,6 +77,9 @@ |
287 |
- for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; |
288 |
- for Driver ("Ada") use |
289 |
- "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; |
290 |
-+ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@"); |
291 |
-+ for Required_Switches ("Ada") use |
292 |
-+ Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); |
293 |
- end Binder; |
294 |
- |
295 |
- for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; |
296 |
---- a/share/gprconfig/c.xml 2019-06-01 21:57:36.244755708 +0200 |
297 |
-+++ b/share/gprconfig/c.xml 2019-06-01 21:59:14.919191663 +0200 |
298 |
-@@ -14,7 +14,7 @@ |
299 |
- </compilers> |
300 |
- <config> |
301 |
- package Compiler is |
302 |
-- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; |
303 |
-+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; |
304 |
- end Compiler; |
305 |
- </config> |
306 |
- </configuration> |
307 |
---- a/share/gprconfig/linker.xml 2019-06-01 21:59:34.546880368 +0200 |
308 |
-+++ b/share/gprconfig/linker.xml 2019-06-01 22:00:50.906668730 +0200 |
309 |
-@@ -112,6 +112,9 @@ |
310 |
- for Object_Lister use ("nm", "-g"); |
311 |
- for Object_Lister_Matcher use " [TDRB] (.*)"; |
312 |
- |
313 |
-+ LDFLAGS := External_As_List ("LDFLAGS", " "); |
314 |
-+ for Leading_Library_Options use LDFLAGS; |
315 |
-+ |
316 |
- package Linker is |
317 |
- for Export_File_Format use "GNU"; |
318 |
- for Export_File_Switch use "-Wl,--version-script="; |
319 |
-@@ -1211,7 +1211,7 @@ |
320 |
- </targets> |
321 |
- <config> |
322 |
- for Library_Partial_Linker use |
323 |
-- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib") |
324 |
-+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib") |
325 |
- & GCC_No_Pie |
326 |
- & ("-Wl,-r", "-o"); |
327 |
- </config> |
328 |
-@@ -1232,7 +1232,7 @@ |
329 |
- </targets> |
330 |
- <config> |
331 |
- for Library_Partial_Linker use |
332 |
-- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib") |
333 |
-+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib") |
334 |
- & GCC_No_Pie |
335 |
- & ("-Wl,-r", "-o"); |
336 |
- </config> |
337 |
|
338 |
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild |
339 |
similarity index 59% |
340 |
rename from dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild |
341 |
rename to dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild |
342 |
index d221c018a4fe..9c520cc6d4a1 100644 |
343 |
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild |
344 |
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild |
345 |
@@ -3,12 +3,11 @@ |
346 |
|
347 |
EAPI=7 |
348 |
|
349 |
-ADA_COMPAT=( gnat_202{0,1} gcc_12_2_0 ) |
350 |
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) |
351 |
|
352 |
inherit ada multiprocessing |
353 |
|
354 |
XMLADA=xmlada-${PV} |
355 |
-GPRCONFIG_KB=gprconfig_kb-${PV} |
356 |
|
357 |
DESCRIPTION="Multi-Language Management" |
358 |
HOMEPAGE="http://libre.adacore.com/" |
359 |
@@ -16,57 +15,28 @@ SRC_URI=" |
360 |
https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz |
361 |
-> ${P}.tar.gz |
362 |
https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz |
363 |
- -> ${XMLADA}.tar.gz |
364 |
- https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v${PV}.tar.gz |
365 |
- -> ${GPRCONFIG_KB}.tar.gz" |
366 |
+ -> ${XMLADA}.tar.gz" |
367 |
LICENSE="GPL-3" |
368 |
SLOT="0" |
369 |
KEYWORDS="~amd64 ~x86" |
370 |
IUSE="" |
371 |
|
372 |
-DEPEND="${ADA_DEPS}" |
373 |
+DEPEND="${ADA_DEPS} |
374 |
+ dev-ada/gprconfig_kb[${ADA_USEDEP}]" |
375 |
RDEPEND="${DEPEND}" |
376 |
|
377 |
REQUIRED_USE="${ADA_REQUIRED_USE}" |
378 |
PATCHES=( |
379 |
"${FILESDIR}"/${P}-gentoo.patch |
380 |
- "${FILESDIR}"/${P}-nm.patch |
381 |
- "${FILESDIR}"/${P}-ar.patch |
382 |
"${FILESDIR}"/${PN}-2021-runpath.patch |
383 |
) |
384 |
|
385 |
src_prepare() { |
386 |
- kb_src=../${GPRCONFIG_KB} |
387 |
- |
388 |
- # Install the gprconfig knowledge base |
389 |
- rm -rf share/gprconfig |
390 |
- cp -r "$kb_src"/db share/gprconfig || die |
391 |
- |
392 |
default |
393 |
- sed -i \ |
394 |
- -e "s:@VER@:${GCC_PV}:g" \ |
395 |
- -e "s:\$gcc_version:${GCC_PV}:g" \ |
396 |
- share/gprconfig/compilers.xml \ |
397 |
- share/gprconfig/gnat.xml \ |
398 |
- share/gprconfig/c.xml \ |
399 |
- share/gprconfig/linker.xml \ |
400 |
- || die |
401 |
sed -i \ |
402 |
-e "s:@GNATBIND@:${GNATBIND}:g" \ |
403 |
src/gprlib.adb \ |
404 |
|| die |
405 |
- if use ada_target_gnat_2020; then |
406 |
- sed -i \ |
407 |
- -e "s:Append_Vector:Append:g" \ |
408 |
- -e "s:Insert_Vector:Insert:g" \ |
409 |
- src/gprbuild-link.adb \ |
410 |
- src/gprinstall-install.adb \ |
411 |
- src/gprlib.adb \ |
412 |
- src/gprlib-build_shared_lib.adb \ |
413 |
- src/gprbind.adb \ |
414 |
- || die |
415 |
- eapply "${FILESDIR}"/${P}-2020.patch |
416 |
- fi |
417 |
} |
418 |
|
419 |
bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" |
420 |
@@ -92,9 +62,6 @@ src_install() { |
421 |
dobin ${bin_progs} |
422 |
exeinto /usr/libexec/gprbuild |
423 |
doexe ${lib_progs} |
424 |
- insinto /usr/share/gprconfig |
425 |
- doins share/gprconfig/*.xml |
426 |
- doins share/gprconfig/*.ent |
427 |
insinto /usr/share/gpr |
428 |
doins share/_default.gpr |
429 |
einstalldocs |