1 |
commit: 2ea89c208511c8b1f9f4f06110b33730b48697f6 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 17 14:17:31 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 17 14:17:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea89c20 |
7 |
|
8 |
dev-ada/gnatcoll: Enable build with gnat_2016 & remove old |
9 |
|
10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-ada/gnatcoll/Manifest | 1 - |
14 |
dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 297 ---------------------- |
15 |
dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch | 169 +++--------- |
16 |
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 127 --------- |
17 |
dev-ada/gnatcoll/gnatcoll-2017.ebuild | 32 +-- |
18 |
5 files changed, 49 insertions(+), 577 deletions(-) |
19 |
|
20 |
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest |
21 |
index 109aacccdc2..3fb4963a439 100644 |
22 |
--- a/dev-ada/gnatcoll/Manifest |
23 |
+++ b/dev-ada/gnatcoll/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a |
26 |
DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 |
27 |
|
28 |
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch |
29 |
deleted file mode 100644 |
30 |
index ee987a72c1f..00000000000 |
31 |
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch |
32 |
+++ /dev/null |
33 |
@@ -1,297 +0,0 @@ |
34 |
---- a/Makefile 2017-01-20 19:39:07.131398270 +0100 |
35 |
-+++ b/Makefile 2017-01-20 19:42:30.088728844 +0100 |
36 |
-@@ -28,7 +28,7 @@ |
37 |
- |
38 |
- # Build either type of library. The argument (%) is the type of library to build |
39 |
- |
40 |
--GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} |
41 |
-+GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} |
42 |
- |
43 |
- build_library_type/%: generate_sources |
44 |
- @${RM} src/gnatcoll-atomic.adb |
45 |
-@@ -34,19 +36,19 @@ |
46 |
- @${RM} src/gnatcoll-atomic.adb |
47 |
- |
48 |
- @echo "====== Building $(@F) libraries ======" |
49 |
-- ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full |
50 |
-+ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -cargs ${ADAFLAGS} |
51 |
- |
52 |
- @# Need to build libgnatcoll_gtk separately, because its project files |
53 |
- @# requires gtkada.gpr, which might not exist on the machine. |
54 |
- ifeq (${WITH_GTK},yes) |
55 |
-- ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk |
56 |
-+ ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS} |
57 |
- endif |
58 |
- |
59 |
- @# Build the tools (the list is the project\'s Main attribute) |
60 |
- @# They are not build as part of the above because only the Main from |
61 |
- @# gnatcoll_full.gpr are build. We could use aggregate projects to |
62 |
- @# speed things up. |
63 |
-- ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools |
64 |
-+ ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS} |
65 |
- |
66 |
- ####################################################################### |
67 |
- # install |
68 |
-@@ -53,6 +53,7 @@ |
69 |
- |
70 |
- GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \ |
71 |
- --exec-subdir=${bindir} --project-subdir=lib/gnat \ |
72 |
-+ -XGPR_BUILD=$(@F) \ |
73 |
- --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F) |
74 |
- |
75 |
- install-clean: |
76 |
---- a/gnatcoll_shared.gpr.in 2017-01-20 19:50:03.222808656 +0100 |
77 |
-+++ b/gnatcoll_shared.gpr.in 2017-01-20 19:50:28.200399274 +0100 |
78 |
-@@ -13,7 +13,7 @@ |
79 |
- |
80 |
- type Yes_No is ("yes", "no"); |
81 |
- Gtk : Yes_No := External ("GTK", "@WITH_GTK@"); |
82 |
-- Python : Yes_No := External ("PYTHON", "@WITH_PYTHON@"); |
83 |
-+ Python : Yes_No := "@WITH_PYTHON@"; |
84 |
- Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@"); |
85 |
- Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@"); |
86 |
- type Sqlite_Inclusion is ("yes", "no", "embedded"); |
87 |
---- a/aclocal.m4 2017-04-06 08:25:14.796699365 +0200 |
88 |
-+++ b/aclocal.m4 2017-04-06 08:25:36.622318016 +0200 |
89 |
-@@ -45,7 +45,7 @@ |
90 |
- cat > conftest.ada <<EOF |
91 |
- [$3] |
92 |
- EOF |
93 |
-- if AC_TRY_COMMAND([gnatchop -q conftest.ada && $1 $2 >/dev/null 2>conftest.out]) |
94 |
-+ if AC_TRY_COMMAND([${GNATCHOP} -q conftest.ada && $1 $2 >/dev/null 2>conftest.out]) |
95 |
- then |
96 |
- : Success |
97 |
- $4 |
98 |
-@@ -68,7 +68,7 @@ |
99 |
- AC_DEFUN(AM_HAS_INTRINSIC_SYNC_COUNTERS, |
100 |
- [ |
101 |
- AC_MSG_CHECKING([whether platform supports atomic inc/dec]) |
102 |
-- AM_TRY_ADA([gnatmake], [check.adb], |
103 |
-+ AM_TRY_ADA([${GNATMAKE}], [check.adb], |
104 |
- [ |
105 |
- with Interfaces; use Interfaces; |
106 |
- procedure Check is |
107 |
---- a/testsuite/json/__init__.py 2017-04-24 17:52:34.158513249 +0200 |
108 |
-+++ b/testsuite/json/__init__.py 2017-04-24 17:52:52.636207017 +0200 |
109 |
-@@ -21,7 +21,7 @@ |
110 |
- @requires_not_aix # Storage_Error on that machine |
111 |
- @chdir("MB28-001") |
112 |
- def test_MB28_001(self): |
113 |
-- self.runexec(["python", "make_json.py"]) |
114 |
-+ self.runexec(["python2.7", "make_json.py"]) |
115 |
- self.gprbuild() |
116 |
- self.runexec("json_stack_test", "test.out") |
117 |
- |
118 |
---- a/testsuite/projects/__init__.py 2017-04-24 19:10:30.465246199 +0200 |
119 |
-+++ b/testsuite/projects/__init__.py 2017-04-24 19:10:42.768035080 +0200 |
120 |
-@@ -105,25 +105,6 @@ |
121 |
- self.gprbuild("default.gpr") |
122 |
- self.runexec("main", "") |
123 |
- |
124 |
-- @support.requires_not_windows |
125 |
-- @chdir("N918-040") |
126 |
-- def test_bareboard(self): |
127 |
-- self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6') |
128 |
-- |
129 |
-- # Make sure auto.cgpr is not deleted on exit |
130 |
-- try: |
131 |
-- os.unlink('auto.cgpr') |
132 |
-- except: |
133 |
-- pass |
134 |
-- self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr']) |
135 |
-- m = re.search('for Target use "(.*?)"', open('auto.cgpr').read()) |
136 |
-- target = m.group(1) |
137 |
-- |
138 |
-- def customFilter(actual): |
139 |
-- return actual.replace(target, "<native>") |
140 |
-- |
141 |
-- self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter) |
142 |
-- |
143 |
- @chdir("NB12-045") |
144 |
- def test_NB12_045(self): |
145 |
- # Test registering attribute in unknown package |
146 |
---- a/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:09.193973179 +0200 |
147 |
-+++ b/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:16.029858932 +0200 |
148 |
-@@ -211,7 +211,7 @@ |
149 |
- |
150 |
- declare |
151 |
- Output : constant String := Get_Command_Output |
152 |
-- (Command => "python", |
153 |
-+ (Command => "python2.7", |
154 |
- Arguments => Args, |
155 |
- Input => "", |
156 |
- Status => Status'Access, |
157 |
---- a/src/gnatcoll_python.gpr.in 2018-11-11 11:04:46.275182850 +0100 |
158 |
-+++ b/src/gnatcoll_python.gpr.in 2018-11-11 11:10:22.809783463 +0100 |
159 |
-@@ -33,14 +33,19 @@ |
160 |
- "lib" & Project'Library_Name |
161 |
- & GnatColl_Shared.So_Ext & "." & GnatColl_Shared.Version; |
162 |
- |
163 |
-- -- When linking a shared library (see Linker_Options below in addition) |
164 |
-- for Library_Options use GnatColl_Shared.Python_Libs; |
165 |
-- |
166 |
- case GnatColl_Shared.Python is |
167 |
- when "yes" => |
168 |
- for Languages use ("Ada", "C"); |
169 |
- for Source_Dirs use ("python"); |
170 |
-- for Library_Options use (@PYTHON_LIBS_GPR@); |
171 |
-+ case Gnatcoll_Shared.Library_Type is |
172 |
-+ when "relocatable" => |
173 |
-+ -- When linking a shared library (see Linker_Options |
174 |
-+ -- below in addition) |
175 |
-+ for Library_Options use GnatColl_Shared.Python_Libs; |
176 |
-+ when others => |
177 |
-+ null; |
178 |
-+ end case; |
179 |
-+ |
180 |
- when "no" => |
181 |
- for Languages use ("Ada"); |
182 |
- for Source_Dirs use ("nopython"); |
183 |
---- a/src/gnatcoll_iconv.gpr 2018-11-11 11:39:47.736090039 +0100 |
184 |
-+++ b/src/gnatcoll_iconv.gpr 2018-11-11 11:40:42.161198640 +0100 |
185 |
-@@ -44,7 +44,13 @@ |
186 |
- for Source_Dirs use ("iconv", "iconv/no_iconv"); |
187 |
- when "yes" => |
188 |
- for Source_Dirs use ("iconv", "iconv/with_iconv"); |
189 |
-- for Library_Options use (GnatColl_Shared.Iconv_Dir) & Gnatcoll_Shared.Iconv_Lib; |
190 |
-+ case Gnatcoll_Shared.Library_Type is |
191 |
-+ when "relocatable" => |
192 |
-+ for Library_Options use (GnatColl_Shared.Iconv_Dir) |
193 |
-+ & Gnatcoll_Shared.Iconv_Lib; |
194 |
-+ when others => |
195 |
-+ null; |
196 |
-+ end case; |
197 |
- end case; |
198 |
- |
199 |
- package Compiler is |
200 |
---- a/src/gnatcoll_sqlite.gpr 2018-11-11 11:45:36.672371038 +0100 |
201 |
-+++ b/src/gnatcoll_sqlite.gpr 2018-11-11 11:48:24.898610725 +0100 |
202 |
-@@ -51,8 +51,15 @@ |
203 |
- for Source_Dirs use ("sqlite", "sqlite/no_sqlite"); |
204 |
- when "yes" => |
205 |
- for Source_Dirs use ("sqlite", "sqlite/with_sqlite"); |
206 |
-- for Library_Options use (GnatColl_Shared.Sqlite_Dir) |
207 |
-- & "-lsqlite3" & Thread_Lib; |
208 |
-+ |
209 |
-+ case Gnatcoll_Shared.Library_Type is |
210 |
-+ when "relocatable" => |
211 |
-+ for Library_Options use (GnatColl_Shared.Sqlite_Dir) |
212 |
-+ & "-lsqlite3" & Thread_Lib; |
213 |
-+ when others => |
214 |
-+ null; |
215 |
-+ end case; |
216 |
-+ |
217 |
- when "embedded" => |
218 |
- for Languages use ("Ada", "C"); |
219 |
- for Source_Dirs use ("sqlite", "sqlite/with_sqlite", "sqlite/amalgamation"); |
220 |
---- a/src/gnatcoll_readline.gpr.in 2018-11-11 11:51:19.119750140 +0100 |
221 |
-+++ b/src/gnatcoll_readline.gpr.in 2018-11-11 11:52:00.531069930 +0100 |
222 |
-@@ -6,7 +6,14 @@ |
223 |
- when "yes" => |
224 |
- for Languages use ("Ada"); |
225 |
- for Source_Dirs use ("readline", "readline/with_readline"); |
226 |
-- for Library_Options use ("-lreadline"); |
227 |
-+ |
228 |
-+ case Gnatcoll_Shared.Library_Type is |
229 |
-+ when "relocatable" => |
230 |
-+ for Library_Options use ("-lreadline"); |
231 |
-+ when others => |
232 |
-+ null; |
233 |
-+ end case; |
234 |
-+ |
235 |
- when "no" => |
236 |
- for Source_Dirs use ("readline", "readline/no_readline"); |
237 |
- end case; |
238 |
---- a/src/gnatcoll_gtk.gpr.in 2018-11-11 11:55:32.460587328 +0100 |
239 |
-+++ b/src/gnatcoll_gtk.gpr.in 2018-11-11 11:56:15.930872692 +0100 |
240 |
-@@ -47,8 +47,15 @@ |
241 |
- for Source_Dirs use (); |
242 |
- when "yes" => |
243 |
- for Source_Dirs use ("gtk"); |
244 |
-- for Library_Options use GnatColl_Shared.Gtk_Libs |
245 |
-- & GnatColl_Shared.Python_Libs; |
246 |
-+ |
247 |
-+ case Gnatcoll_Shared.Library_Type is |
248 |
-+ when "relocatable" => |
249 |
-+ for Library_Options use GnatColl_Shared.Gtk_Libs |
250 |
-+ & GnatColl_Shared.Python_Libs; |
251 |
-+ when others => |
252 |
-+ null; |
253 |
-+ end case; |
254 |
-+ |
255 |
- case GnatColl_Shared.Python is |
256 |
- when "yes" => |
257 |
- for Source_Dirs use Project'Source_Dirs & ("gtk/python"); |
258 |
---- a/src/gnatcoll-projects-normalize.adb 2018-11-13 19:34:01.491003676 +0100 |
259 |
-+++ b/src/gnatcoll-projects-normalize.adb 2018-11-13 19:34:16.289760553 +0100 |
260 |
-@@ -2202,7 +2202,7 @@ |
261 |
- when N_Comment_Zones => |
262 |
- null; |
263 |
- |
264 |
-- when N_Comment => |
265 |
-+ when others => |
266 |
- null; |
267 |
- end case; |
268 |
- end if; |
269 |
---- a/src/gnatcoll-projects.adb 2018-11-14 18:47:27.760365233 +0100 |
270 |
-+++ b/src/gnatcoll-projects.adb 2018-11-14 19:10:43.961337201 +0100 |
271 |
-@@ -3273,9 +3273,9 @@ |
272 |
- Status : out Status_Type; |
273 |
- Result : out GNATCOLL.VFS.File_Array_Access) |
274 |
- is |
275 |
-- Mains_Str_List : String_List_Access; |
276 |
-+ Mains_Str_List : String_Vectors.Vector; |
277 |
- Closure_Status : GPR.Util.Status_Type; |
278 |
-- Closures_List : String_List_Access; |
279 |
-+ Closures_List : String_Vectors.Vector; |
280 |
- begin |
281 |
- Trace (Me, "Get_Closures"); |
282 |
- |
283 |
-@@ -3287,25 +3287,18 @@ |
284 |
- return; |
285 |
- end if; |
286 |
- |
287 |
-- Mains_Str_List := new String_List (Mains'First .. Mains'Last); |
288 |
- for I in Mains'Range loop |
289 |
-- Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name); |
290 |
-+ Mains_Str_List.Append (Mains (I).Display_Base_Name); |
291 |
- end loop; |
292 |
- |
293 |
- GPR.Util.Get_Closures |
294 |
- (Project.Get_View, Project.Tree_View, |
295 |
-- Mains => Mains_Str_List.all, |
296 |
-+ Mains => Mains_Str_List, |
297 |
- All_Projects => All_Projects, |
298 |
- Include_Externally_Built => Include_Externally_Built, |
299 |
- Status => Closure_Status, |
300 |
- Result => Closures_List); |
301 |
- |
302 |
-- -- Freeing temporary list of mains. |
303 |
-- for I in Mains_Str_List'Range loop |
304 |
-- Free (Mains_Str_List (I)); |
305 |
-- end loop; |
306 |
-- Free (Mains_Str_List); |
307 |
-- |
308 |
- case Closure_Status is |
309 |
- when Success => |
310 |
- Status := Success; |
311 |
-@@ -3321,17 +3314,10 @@ |
312 |
- end case; |
313 |
- |
314 |
- if Closure_Status in Success | Incomplete_Closure then |
315 |
-- for I in Closures_List'Range loop |
316 |
-- Append (Result, Create (+Closures_List (I).all)); |
317 |
-+ for Closure of Closures_List loop |
318 |
-+ Append (Result, Create (+Closure)); |
319 |
- end loop; |
320 |
- end if; |
321 |
-- |
322 |
-- -- Freeing temporary list of closures. |
323 |
-- for I in Closures_List'Range loop |
324 |
-- Free (Closures_List (I)); |
325 |
-- end loop; |
326 |
-- Free (Closures_List); |
327 |
-- |
328 |
- end Get_Closures; |
329 |
- |
330 |
- ---------------- |
331 |
|
332 |
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch |
333 |
index ecec0b78458..36da82626f4 100644 |
334 |
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch |
335 |
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch |
336 |
@@ -1,63 +1,45 @@ |
337 |
---- gnatcoll-gpl-2016-src/Makefile.old 2017-01-20 19:39:07.131398270 +0100 |
338 |
-+++ gnatcoll-gpl-2016-src/Makefile 2017-01-20 19:42:30.088728844 +0100 |
339 |
-@@ -49,12 +49,12 @@ |
340 |
+--- a/Makefile 2017-01-20 19:39:07.131398270 +0100 |
341 |
++++ b/Makefile 2017-01-20 19:42:30.088728844 +0100 |
342 |
+@@ -43,18 +43,18 @@ |
343 |
+ |
344 |
+ # Build either type of library. The argument (%) is the type of library to build |
345 |
+ |
346 |
+-GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F) |
347 |
++GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F) |
348 |
+ |
349 |
+ build_library_type/%: generate_sources |
350 |
@${RM} src/gnatcoll-atomic.adb |
351 |
|
352 |
@echo "====== Building $(@F) libraries ======" |
353 |
- ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full |
354 |
-+ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS} |
355 |
++ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -cargs ${ADAFLAGS} |
356 |
|
357 |
@# Need to build libgnatcoll_gtk separately, because its project files |
358 |
@# requires gtkada.gpr, which might not exist on the machine. |
359 |
ifeq (${WITH_GTK},yes) |
360 |
- ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk |
361 |
-+ ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -cargs ${ADAFLAGS} |
362 |
++ ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS} |
363 |
endif |
364 |
|
365 |
build_tools/%: build_library_type/% |
366 |
-@@ -63,7 +63,7 @@ |
367 |
+@@ -63,13 +63,14 @@ |
368 |
@# They are not build as part of the above because only the Main from |
369 |
@# gnatcoll_full.gpr are build. We could use aggregate projects to |
370 |
@# speed things up. |
371 |
- ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools |
372 |
-+ ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -cargs ${ADAFLAGS} |
373 |
++ ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS} |
374 |
|
375 |
####################################################################### |
376 |
# install |
377 |
---- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old 2017-01-07 08:58:01.361112843 +0100 |
378 |
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr 2017-01-07 08:58:23.653687385 +0100 |
379 |
-@@ -26,6 +26,7 @@ |
380 |
|
381 |
- package Compiler is |
382 |
- for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada"); |
383 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
384 |
- for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C") |
385 |
- & GnatColl_Shared.Iconv_Include; |
386 |
- end Compiler; |
387 |
---- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old 2017-01-07 09:00:17.146448202 +0100 |
388 |
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr 2017-01-07 09:00:44.884885281 +0100 |
389 |
-@@ -60,8 +60,9 @@ |
390 |
+ GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \ |
391 |
+ --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \ |
392 |
++ -XGPR_BUILD=$(@F) \ |
393 |
+ --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F) |
394 |
|
395 |
- -- force full optimization for sqlite, we do not debug it |
396 |
- -- in any case. |
397 |
- "-O3") & Gnatcoll_Shared.Sqlite_Switches; |
398 |
- end case; |
399 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
400 |
- end Compiler; |
401 |
- |
402 |
- package Linker is |
403 |
---- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old 2017-01-07 09:05:09.177756146 +0100 |
404 |
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr 2017-01-07 09:05:34.282279733 +0100 |
405 |
-@@ -38,6 +38,7 @@ |
406 |
- for Switches ("C") use |
407 |
- GnatColl_Shared.Compiler'Switches ("C"); |
408 |
- end case; |
409 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
410 |
- end Compiler; |
411 |
- |
412 |
- package Linker is |
413 |
---- gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in.old 2017-01-20 19:50:03.222808656 +0100 |
414 |
-+++ gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in 2017-01-20 19:50:28.200399274 +0100 |
415 |
+ install-clean: |
416 |
+--- a/gnatcoll_shared.gpr.in 2017-01-20 19:50:03.222808656 +0100 |
417 |
++++ b/gnatcoll_shared.gpr.in 2017-01-20 19:50:28.200399274 +0100 |
418 |
@@ -13,7 +13,7 @@ |
419 |
|
420 |
type Yes_No is ("yes", "no"); |
421 |
@@ -67,29 +49,8 @@ |
422 |
Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@"); |
423 |
Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@"); |
424 |
type Sqlite_Inclusion is ("yes", "no", "embedded"); |
425 |
---- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old 2017-02-04 15:56:11.685079607 +0100 |
426 |
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr 2017-02-04 15:57:00.383221978 +0100 |
427 |
-@@ -49,6 +49,8 @@ |
428 |
- package Builder renames GnatColl_Shared.Builder; |
429 |
- |
430 |
- package Compiler is |
431 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
432 |
-+ |
433 |
- for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada"); |
434 |
- for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C"); |
435 |
- for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg"); |
436 |
---- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old 2017-02-04 15:58:41.008450044 +0100 |
437 |
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr 2017-02-04 15:59:02.815066080 +0100 |
438 |
-@@ -64,6 +64,7 @@ |
439 |
- for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada"); |
440 |
- for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C"); |
441 |
- for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg"); |
442 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
443 |
- |
444 |
- case GnatColl_Shared.Atomics is |
445 |
- when "intrinsic" => |
446 |
---- gnatcoll-gpl-2016-src/aclocal.m4.old 2017-04-06 08:25:14.796699365 +0200 |
447 |
-+++ gnatcoll-gpl-2016-src/aclocal.m4 2017-04-06 08:25:36.622318016 +0200 |
448 |
+--- a/aclocal.m4 2017-04-06 08:25:14.796699365 +0200 |
449 |
++++ b/aclocal.m4 2017-04-06 08:25:36.622318016 +0200 |
450 |
@@ -45,7 +45,7 @@ |
451 |
cat > conftest.ada <<EOF |
452 |
[$3] |
453 |
@@ -108,8 +69,8 @@ |
454 |
[ |
455 |
with Interfaces; use Interfaces; |
456 |
procedure Check is |
457 |
---- gnatcoll-gpl-2016-src/testsuite/json/__init__.py.old 2017-04-24 17:52:34.158513249 +0200 |
458 |
-+++ gnatcoll-gpl-2016-src/testsuite/json/__init__.py 2017-04-24 17:52:52.636207017 +0200 |
459 |
+--- a/testsuite/json/__init__.py 2017-04-24 17:52:34.158513249 +0200 |
460 |
++++ b/testsuite/json/__init__.py 2017-04-24 17:52:52.636207017 +0200 |
461 |
@@ -21,7 +21,7 @@ |
462 |
@requires_not_aix # Storage_Error on that machine |
463 |
@chdir("MB28-001") |
464 |
@@ -119,26 +80,8 @@ |
465 |
self.gprbuild() |
466 |
self.runexec("json_stack_test", "test.out") |
467 |
|
468 |
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old 2017-04-24 18:00:21.652975475 +0200 |
469 |
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr 2017-04-24 18:01:23.035983670 +0200 |
470 |
-@@ -15,5 +15,6 @@ |
471 |
- for Default_Switches ("ada") use |
472 |
- ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty"); |
473 |
-+ for Driver ("c") use External ("GCC", "gcc"); |
474 |
- end Compiler; |
475 |
- |
476 |
- end c; |
477 |
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old 2017-04-24 18:01:28.394896928 +0200 |
478 |
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr 2017-04-24 18:01:44.343638682 +0200 |
479 |
-@@ -15,5 +15,6 @@ |
480 |
- for Default_Switches ("ada") use |
481 |
- ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty"); |
482 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
483 |
- end Compiler; |
484 |
- |
485 |
- end c; |
486 |
---- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old 2017-04-24 19:10:30.465246199 +0200 |
487 |
-+++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py 2017-04-24 19:10:42.768035080 +0200 |
488 |
+--- a/testsuite/projects/__init__.py 2017-04-24 19:10:30.465246199 +0200 |
489 |
++++ b/testsuite/projects/__init__.py 2017-04-24 19:10:42.768035080 +0200 |
490 |
@@ -105,25 +105,6 @@ |
491 |
self.gprbuild("default.gpr") |
492 |
self.runexec("main", "") |
493 |
@@ -165,27 +108,8 @@ |
494 |
@chdir("NB12-045") |
495 |
def test_NB12_045(self): |
496 |
# Test registering attribute in unknown package |
497 |
---- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old 2017-04-24 20:01:55.535913959 +0200 |
498 |
-+++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr 2017-04-24 20:02:51.740950192 +0200 |
499 |
-@@ -1,3 +1,6 @@ |
500 |
- project Default is |
501 |
- for Languages use ("Ada", "C"); |
502 |
-+ package Compiler is |
503 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
504 |
-+ end Compiler; |
505 |
- end Default; |
506 |
---- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old 2017-04-24 20:04:12.012574064 +0200 |
507 |
-+++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr 2017-04-24 20:04:54.025853974 +0200 |
508 |
-@@ -6,4 +6,7 @@ |
509 |
- for Body_Suffix ("c++") use ".cc"; |
510 |
- end Naming; |
511 |
- |
512 |
-+ package Compiler is |
513 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
514 |
-+ end Compiler; |
515 |
- end Dummy; |
516 |
---- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old 2017-04-24 21:36:09.193973179 +0200 |
517 |
-+++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:16.029858932 +0200 |
518 |
+--- a/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:09.193973179 +0200 |
519 |
++++ b/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:16.029858932 +0200 |
520 |
@@ -211,7 +211,7 @@ |
521 |
|
522 |
declare |
523 |
@@ -195,35 +119,8 @@ |
524 |
Arguments => Args, |
525 |
Input => "", |
526 |
Status => Status'Access, |
527 |
---- gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr.old 2017-06-24 18:06:19.702063079 +0200 |
528 |
-+++ gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr 2017-06-24 18:05:04.276103652 +0200 |
529 |
-@@ -60,6 +60,7 @@ |
530 |
- |
531 |
- for Switches ("C") use |
532 |
-- ("-g", "-O2") & GnatColl_Shared.Python_Cflags; |
533 |
-+ ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags; |
534 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
535 |
- end Compiler; |
536 |
- |
537 |
- package Linker is |
538 |
---- gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr.old 2017-06-24 18:37:22.164631219 +0200 |
539 |
-+++ gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr 2017-06-24 18:37:55.763186201 +0200 |
540 |
-@@ -71,11 +71,12 @@ |
541 |
- for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada"); |
542 |
- |
543 |
- for Switches ("C") use |
544 |
-- ("-g", "-O2") |
545 |
-+ ("-g", "-O2", "-fPIC") |
546 |
- & GnatColl_Shared.Python_Cflags |
547 |
- & GnatColl_Shared.Pygtk_Include |
548 |
- & GnatColl_Shared.PyGobject_Include |
549 |
- & Gtk_Include; |
550 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
551 |
- end Compiler; |
552 |
- |
553 |
- package Linker is |
554 |
---- gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads.old 2017-11-25 14:50:06.919939453 +0100 |
555 |
-+++ gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 |
556 |
+--- a/src/gnatcoll-projects.ads 2017-11-25 14:50:06.919939453 +0100 |
557 |
++++ b/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 |
558 |
@@ -1917,7 +1917,8 @@ |
559 |
Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access; |
560 |
-- The list of source files in Predefined_Source_Path |
561 |
@@ -234,8 +131,8 @@ |
562 |
-- The default gnatls command to run. |
563 |
|
564 |
Xrefs_Subdir : GNAT.Strings.String_Access; |
565 |
---- gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb.old 2017-11-25 14:52:47.282170250 +0100 |
566 |
-+++ gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb 2017-11-25 14:52:57.691990254 +0100 |
567 |
+--- a/src/tools/gnatinspect.adb 2017-11-25 14:52:47.282170250 +0100 |
568 |
++++ b/src/tools/gnatinspect.adb 2017-11-25 14:52:57.691990254 +0100 |
569 |
@@ -642,7 +642,7 @@ |
570 |
GNAT_Version : GNAT.Strings.String_Access; |
571 |
begin |
572 |
|
573 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
574 |
deleted file mode 100644 |
575 |
index 0194b141db2..00000000000 |
576 |
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
577 |
+++ /dev/null |
578 |
@@ -1,127 +0,0 @@ |
579 |
-# Copyright 1999-2018 Gentoo Authors |
580 |
-# Distributed under the terms of the GNU General Public License v2 |
581 |
- |
582 |
-EAPI=6 |
583 |
-PYTHON_COMPAT=( python2_7 ) |
584 |
-inherit multilib multiprocessing autotools python-single-r1 |
585 |
- |
586 |
-MYP=${PN}-gpl-${PV} |
587 |
- |
588 |
-DESCRIPTION="GNAT Component Collection" |
589 |
-HOMEPAGE="http://libre.adacore.com" |
590 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7 |
591 |
- -> ${MYP}-src.tar.gz" |
592 |
- |
593 |
-LICENSE="GPL-3" |
594 |
-SLOT="0" |
595 |
-KEYWORDS="amd64 x86" |
596 |
-IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline |
597 |
- +shared sqlite static-libs syslog tools" |
598 |
- |
599 |
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
600 |
- gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) |
601 |
- ${PYTHON_DEPS} |
602 |
- gmp? ( dev-libs/gmp:* ) |
603 |
- gtk? ( |
604 |
- dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] |
605 |
- dev-libs/atk |
606 |
- dev-libs/glib |
607 |
- x11-libs/cairo |
608 |
- x11-libs/gdk-pixbuf |
609 |
- x11-libs/gtk+:3 |
610 |
- x11-libs/pango |
611 |
- ) |
612 |
- pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) |
613 |
- postgres? ( dev-db/postgresql:* ) |
614 |
- sqlite? ( dev-db/sqlite ) |
615 |
- projects? ( |
616 |
- ~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?] |
617 |
- dev-ada/xmlada[shared?,static-libs?] |
618 |
- )" |
619 |
-DEPEND="${RDEPEND} |
620 |
- dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
621 |
- |
622 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
623 |
- tools? ( static-libs ) |
624 |
- pygobject? ( gtk ) |
625 |
- ^^ ( gnat_2016 gnat_2017 )" |
626 |
- |
627 |
-S="${WORKDIR}"/${MYP}-src |
628 |
- |
629 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
630 |
- |
631 |
-src_prepare() { |
632 |
- default |
633 |
- mv configure.{in,ac} || die |
634 |
- eautoreconf |
635 |
-} |
636 |
- |
637 |
-src_configure() { |
638 |
- if use gnat_2016; then |
639 |
- GCC_PV=4.9.4 |
640 |
- else |
641 |
- GCC_PV=6.3.0 |
642 |
- fi |
643 |
- GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
644 |
- GNATCHOP=${CHOST}-gnatchop-${GCC_PV} |
645 |
- if use sqlite; then |
646 |
- myConf="--with-sqlite=$(get_libdir)" |
647 |
- else |
648 |
- myConf="--without-sqlite" |
649 |
- fi |
650 |
- if use gtk ; then |
651 |
- myConf="$myConf --with-gtk=3.0" |
652 |
- else |
653 |
- myConf="$myConf --with-gtk=no" |
654 |
- fi |
655 |
- econf \ |
656 |
- GNATCHOP="${GNATCHOP}" \ |
657 |
- GNATMAKE="${GNATMAKE}" \ |
658 |
- --with-python \ |
659 |
- $(use_with gmp) \ |
660 |
- $(use_with iconv) \ |
661 |
- $(use_with postgres postgresql) \ |
662 |
- $(use_enable projects) \ |
663 |
- $(use_enable pygobject) \ |
664 |
- $(use_enable readline gpl) \ |
665 |
- $(use_enable readline) \ |
666 |
- $(use_enable syslog) \ |
667 |
- --with-python-exec=${EPYTHON} \ |
668 |
- --enable-shared-python \ |
669 |
- --disable-pygtk \ |
670 |
- $myConf |
671 |
-} |
672 |
- |
673 |
-src_compile() { |
674 |
- if use shared; then |
675 |
- emake PROCESSORS=$(makeopts_jobs) \ |
676 |
- build_library_type/relocatable |
677 |
- fi |
678 |
- if use static-libs; then |
679 |
- emake PROCESSORS=$(makeopts_jobs) \ |
680 |
- build_library_type/static |
681 |
- fi |
682 |
- python_fix_shebang . |
683 |
-} |
684 |
- |
685 |
-src_install() { |
686 |
- if use shared; then |
687 |
- emake prefix="${D}usr" install_library_type/relocatable |
688 |
- fi |
689 |
- if use static-libs; then |
690 |
- emake prefix="${D}usr" install_library_type/static |
691 |
- fi |
692 |
- emake prefix="${D}usr" install_gps_plugin |
693 |
- einstalldocs |
694 |
- dodoc -r features-* known-problems-* |
695 |
-} |
696 |
- |
697 |
-src_test() { |
698 |
- # The test suite is in |
699 |
- # To run you need to have the ada compiler available as gcc |
700 |
- # Even in this case there are still some problem |
701 |
- # Going into the testsuite directory and running |
702 |
- # ./run.py -v -v |
703 |
- # run here (having enabled most USE flags) |
704 |
- true |
705 |
-} |
706 |
|
707 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
708 |
index e13a6333db2..8790026af64 100644 |
709 |
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
710 |
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
711 |
@@ -1,4 +1,4 @@ |
712 |
-# Copyright 1999-2018 Gentoo Foundation |
713 |
+# Copyright 1999-2018 Gentoo Authors |
714 |
# Distributed under the terms of the GNU General Public License v2 |
715 |
|
716 |
EAPI=6 |
717 |
@@ -18,11 +18,12 @@ KEYWORDS="amd64 x86" |
718 |
IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline |
719 |
+shared sqlite static-libs syslog tools" |
720 |
|
721 |
-RDEPEND="dev-lang/gnat-gpl:6.3.0 |
722 |
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
723 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) |
724 |
${PYTHON_DEPS} |
725 |
gmp? ( dev-libs/gmp:* ) |
726 |
gtk? ( |
727 |
- dev-ada/gtkada[gnat_2017,shared?,static-libs?] |
728 |
+ dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] |
729 |
dev-libs/atk |
730 |
dev-libs/glib |
731 |
x11-libs/cairo |
732 |
@@ -34,23 +35,27 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0 |
733 |
postgres? ( dev-db/postgresql:* ) |
734 |
sqlite? ( dev-db/sqlite ) |
735 |
projects? ( |
736 |
- =dev-ada/libgpr-2017*[gnat_2017,shared?,static-libs?] |
737 |
+ ~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?] |
738 |
dev-ada/xmlada[shared?,static-libs?] |
739 |
)" |
740 |
DEPEND="${RDEPEND} |
741 |
- dev-ada/gprbuild[gnat_2017]" |
742 |
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
743 |
|
744 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
745 |
tools? ( static-libs ) |
746 |
pygobject? ( gtk ) |
747 |
- !gnat_2016 gnat_2017" |
748 |
+ ^^ ( gnat_2016 gnat_2017 )" |
749 |
|
750 |
S="${WORKDIR}"/${MYP}-src |
751 |
|
752 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
753 |
|
754 |
src_prepare() { |
755 |
- GCC_PV=6.3.0 |
756 |
+ if use gnat_2016; then |
757 |
+ GCC_PV=4.9.4 |
758 |
+ else |
759 |
+ GCC_PV=6.3.0 |
760 |
+ fi |
761 |
default |
762 |
mv configure.{in,ac} || die |
763 |
sed -i \ |
764 |
@@ -62,7 +67,6 @@ src_prepare() { |
765 |
} |
766 |
|
767 |
src_configure() { |
768 |
- GCC=${CHOST}-gcc-${GCC_PV} |
769 |
GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
770 |
GNATCHOP=${CHOST}-gnatchop-${GCC_PV} |
771 |
if use sqlite; then |
772 |
@@ -90,22 +94,18 @@ src_configure() { |
773 |
--with-python-exec=${EPYTHON} \ |
774 |
--enable-shared-python \ |
775 |
--disable-pygtk \ |
776 |
- CC=${GCC} \ |
777 |
$myConf |
778 |
} |
779 |
|
780 |
src_compile() { |
781 |
if use shared; then |
782 |
- emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
783 |
- build_library_type/relocatable |
784 |
+ emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable |
785 |
fi |
786 |
if use static-libs; then |
787 |
- emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
788 |
- build_library_type/static |
789 |
+ emake PROCESSORS=$(makeopts_jobs) build_library_type/static |
790 |
fi |
791 |
if use tools; then |
792 |
- emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
793 |
- build_tools/static |
794 |
+ emake PROCESSORS=$(makeopts_jobs) build_tools/static |
795 |
fi |
796 |
python_fix_shebang . |
797 |
} |
798 |
@@ -127,7 +127,7 @@ src_install() { |
799 |
src_test() { |
800 |
# The test suite is in |
801 |
# To run you need to have the ada compiler available as gcc |
802 |
- # Even in this case there are still some problem |
803 |
+ # Even in this case there are still some problems |
804 |
# Going into the testsuite directory and running |
805 |
# ./run.py -v -v |
806 |
# run here (having enabled most USE flags) |