1 |
commit: e4b0680c19c1deb6a5063740ee1082b85e2497d9 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 17 19:54:02 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 17 19:54:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b0680c |
7 |
|
8 |
dev-ada/gprbuild: bump to 2018-r2 trying to fix C builds |
9 |
|
10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
12 |
|
13 |
dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 167 +++++++++++++++++++++ |
14 |
dev-ada/gprbuild/files/gprbuild-2018.xml | 93 ------------ |
15 |
...uild-2018-r1.ebuild => gprbuild-2018-r2.ebuild} | 18 ++- |
16 |
3 files changed, 178 insertions(+), 100 deletions(-) |
17 |
|
18 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch |
19 |
index 35a98ae03fc..9f62ec9ff9d 100644 |
20 |
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch |
21 |
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch |
22 |
@@ -96,3 +96,170 @@ |
23 |
|
24 |
when Copy_Source_Dir => |
25 |
Copy_Source_Directory := new String'(Line (1 .. Last)); |
26 |
+--- a/share/gprconfig/compilers.xml 2018-10-17 14:36:15.100480516 +0200 |
27 |
++++ b/share/gprconfig/compilers.xml 2018-10-17 15:38:57.333256634 +0200 |
28 |
+@@ -20,15 +20,15 @@ |
29 |
+ <!-- GCC 3.x & 4.x (not for GNAT Pro)--> |
30 |
+ <compiler_description> |
31 |
+ <name>GCC</name> |
32 |
+- <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> |
33 |
++ <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> |
34 |
+ <version> |
35 |
+- <external>${PREFIX}gcc -v</external> |
36 |
++ <external>${PREFIX}gcc-@VER@ -v</external> |
37 |
+ <nogrep regexp="for GNAT Pro"></nogrep> |
38 |
+ <grep regexp="^gcc \S+ (\S+)" group="1"></grep> |
39 |
+ </version> |
40 |
+ <languages>C</languages> |
41 |
+ <target> |
42 |
+- <external>${PREFIX}gcc -dumpmachine</external> |
43 |
++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> |
44 |
+ <grep regexp="[^\r\n]+"></grep> |
45 |
+ </target> |
46 |
+ </compiler_description> |
47 |
+@@ -170,14 +170,14 @@ |
48 |
+ --> |
49 |
+ <compiler_description> |
50 |
+ <name>GNAT</name> |
51 |
+- <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-|.*-qnx.*)?gnatls</executable> |
52 |
++ <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-|.*-qnx.*)?gnatls-@VER@</executable> |
53 |
+ <version> |
54 |
+- <external>${PREFIX}gnatls -v --version</external> |
55 |
++ <external>${PREFIX}gnatls-@VER@ -v --version</external> |
56 |
+ <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
57 |
+ </version> |
58 |
+ <languages>Ada</languages> |
59 |
+ <variable name="gcc_version"> |
60 |
+- <external>${PREFIX}gcc -v</external> |
61 |
++ <external>${PREFIX}gcc-@VER@ -v</external> |
62 |
+ <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
63 |
+ </variable> |
64 |
+ <runtimes default="default,kernel,native"> |
65 |
+@@ -187,71 +187,11 @@ |
66 |
+ <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory> |
67 |
+ </runtimes> |
68 |
+ <target> |
69 |
+- <external>${PREFIX}gcc -dumpmachine</external> |
70 |
++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> |
71 |
+ <grep regexp="[^\r\n]+"></grep> |
72 |
+ </target> |
73 |
+ </compiler_description> |
74 |
+ |
75 |
+- <!-- CodePeer --> |
76 |
+- |
77 |
+- <compiler_description> |
78 |
+- <name>GNAT_CODEPEER</name> |
79 |
+- <executable prefix="1">(.*codepeer-)gnatls</executable> |
80 |
+- <version> |
81 |
+- <external>${PREFIX}gnatls -v</external> |
82 |
+- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
83 |
+- </version> |
84 |
+- <languages>Ada</languages> |
85 |
+- <variable name="gcc_version"> |
86 |
+- <external>${PREFIX}gcc -v</external> |
87 |
+- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
88 |
+- </variable> |
89 |
+- <runtimes default="default,native"> |
90 |
+- <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory> |
91 |
+- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory> |
92 |
+- <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory> |
93 |
+- </runtimes> |
94 |
+- <target>codepeer</target> |
95 |
+- </compiler_description> |
96 |
+- |
97 |
+- <!-- C Target --> |
98 |
+- |
99 |
+- <compiler_description> |
100 |
+- <name>GNAT_C</name> |
101 |
+- <executable prefix="1">(c-)gnatls</executable> |
102 |
+- <version> |
103 |
+- <external>${PREFIX}gnatls -v</external> |
104 |
+- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
105 |
+- </version> |
106 |
+- <languages>Ada</languages> |
107 |
+- <variable name="gcc_version"> |
108 |
+- <external>${PREFIX}gcc -v</external> |
109 |
+- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
110 |
+- </variable> |
111 |
+- <runtimes default="default"> |
112 |
+- <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory> |
113 |
+- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory> |
114 |
+- </runtimes> |
115 |
+- <target>c</target> |
116 |
+- </compiler_description> |
117 |
+- |
118 |
+- <!-- GNAT_DOTNET --> |
119 |
+- |
120 |
+- <compiler_description> |
121 |
+- <name>GNAT_DOTNET</name> |
122 |
+- <executable prefix="1">(.*dotnet-)gnatls</executable> |
123 |
+- <version> |
124 |
+- <external>${PREFIX}gnatls -v</external> |
125 |
+- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
126 |
+- </version> |
127 |
+- <languages>Ada</languages> |
128 |
+- <runtimes default="default,kernel"> |
129 |
+- <directory group="default" >\.\./lib/dotgnat/adalib/</directory> |
130 |
+- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory> |
131 |
+- </runtimes> |
132 |
+- <target>dotnet</target> |
133 |
+- </compiler_description> |
134 |
+- |
135 |
+ <!-- G77 --> |
136 |
+ <compiler_description> |
137 |
+ <name>G77</name> |
138 |
+@@ -295,21 +295,6 @@ |
139 |
+ </target> |
140 |
+ </compiler_description> |
141 |
+ |
142 |
+- <!-- LLVM Compiler --> |
143 |
+- <compiler_description> |
144 |
+- <name>LLVM</name> |
145 |
+- <executable>clang</executable> |
146 |
+- <version> |
147 |
+- <external>clang -v</external> |
148 |
+- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep> |
149 |
+- </version> |
150 |
+- <languages>C</languages> |
151 |
+- <target> |
152 |
+- <external>clang -dumpmachine</external> |
153 |
+- <grep regexp="[^\r\n]+"></grep> |
154 |
+- </target> |
155 |
+- </compiler_description> |
156 |
+- |
157 |
+ <!-- Windres compiler --> |
158 |
+ <compiler_description> |
159 |
+ <name>WINDRES</name> |
160 |
+--- a/share/gprconfig/gnat.xml 2018-10-17 18:38:35.547094541 +0200 |
161 |
++++ b/share/gprconfig/gnat.xml 2018-10-17 18:40:16.281379341 +0200 |
162 |
+@@ -60,7 +60,7 @@ |
163 |
+ &filter_gnat; |
164 |
+ <config> |
165 |
+ package Compiler is |
166 |
+- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; |
167 |
++ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; |
168 |
+ for Language_Kind ("Ada") use "unit_based"; |
169 |
+ for Dependency_Kind ("Ada") use "ALI_File"; |
170 |
+ for Leading_Required_Switches ("Ada") use |
171 |
+--- a/share/gprconfig/c.xml 2018-10-17 21:31:44.442501471 +0200 |
172 |
++++ b/share/gprconfig/c.xml 2018-10-17 21:33:06.562088044 +0200 |
173 |
+@@ -14,7 +14,7 @@ |
174 |
+ </compilers> |
175 |
+ <config> |
176 |
+ package Compiler is |
177 |
+- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; |
178 |
++ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; |
179 |
+ end Compiler; |
180 |
+ </config> |
181 |
+ </configuration> |
182 |
+--- a/share/gprconfig/linker.xml 2018-10-17 21:36:15.856883517 +0200 |
183 |
++++ b/share/gprconfig/linker.xml 2018-10-17 21:35:15.985896804 +0200 |
184 |
+@@ -1044,7 +1044,7 @@ |
185 |
+ </targets> |
186 |
+ <config> |
187 |
+ for Library_Partial_Linker use |
188 |
+- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); |
189 |
++ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); |
190 |
+ </config> |
191 |
+ </configuration> |
192 |
+ |
193 |
|
194 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml b/dev-ada/gprbuild/files/gprbuild-2018.xml |
195 |
deleted file mode 100644 |
196 |
index 56c4f896919..00000000000 |
197 |
--- a/dev-ada/gprbuild/files/gprbuild-2018.xml |
198 |
+++ /dev/null |
199 |
@@ -1,93 +0,0 @@ |
200 |
-<?xml version="1.0" ?> |
201 |
-<gprconfig> |
202 |
- <compiler_description> |
203 |
- <name>GNAT-@VER@</name> |
204 |
- <executable prefix="1">gnatls-@VER@</executable> |
205 |
- <version> |
206 |
- <external>${PREFIX}gnatls-@VER@ -v --version</external> |
207 |
- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
208 |
- </version> |
209 |
- <languages>Ada</languages> |
210 |
- <variable name="gcc_version"> |
211 |
- <external>${PREFIX}gcc-@VER@ -v</external> |
212 |
- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
213 |
- </variable> |
214 |
- <runtimes default="default,kernel,native"> |
215 |
- <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory> |
216 |
- <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory> |
217 |
- <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory> |
218 |
- <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory> |
219 |
- </runtimes> |
220 |
- <target> |
221 |
- <external>${PREFIX}gcc-@VER@ -dumpmachine</external> |
222 |
- <grep regexp="[^\r\n]+"></grep> |
223 |
- </target> |
224 |
- </compiler_description> |
225 |
- |
226 |
- <configuration> |
227 |
- <compilers> |
228 |
- <compiler name="GNAT-@VER@" /> |
229 |
- </compilers> |
230 |
- <config> |
231 |
- package Compiler is |
232 |
- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; |
233 |
- for Language_Kind ("Ada") use "unit_based"; |
234 |
- for Dependency_Kind ("Ada") use "ALI_File"; |
235 |
- for Leading_Required_Switches ("Ada") use |
236 |
- ("-c", "-x", "ada", "-gnatA") |
237 |
- & Compiler'Leading_Required_Switches ("Ada"); |
238 |
- for Mapping_File_Switches ("Ada") use ("-gnatem="); |
239 |
- for Mapping_Spec_Suffix ("Ada") use "%s"; |
240 |
- for Mapping_Body_Suffix ("Ada") use "%b"; |
241 |
- for Config_File_Switches ("Ada") use ("-gnatec="); |
242 |
- for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE"; |
243 |
- for Multi_Unit_Switches ("Ada") use ("-gnateI"); |
244 |
- for Multi_Unit_Object_Separator ("Ada") use "~"; |
245 |
- for Config_Body_File_Name ("Ada") use |
246 |
- "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");"; |
247 |
- for Config_Spec_File_Name ("Ada") use |
248 |
- "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");"; |
249 |
- for Config_Body_File_Name_Index ("Ada") use |
250 |
- "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);"; |
251 |
- for Config_Spec_File_Name_Index ("Ada") use |
252 |
- "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);"; |
253 |
- for Config_Body_File_Name_Pattern ("Ada") use |
254 |
- "pragma Source_File_Name_Project " & |
255 |
- " (Body_File_Name => ""*%b""," & |
256 |
- " Casing => %c," & |
257 |
- " Dot_Replacement => ""%d"");"; |
258 |
- for Config_Spec_File_Name_Pattern ("Ada") use |
259 |
- "pragma Source_File_Name_Project " & |
260 |
- " (Spec_File_Name => ""*%s""," & |
261 |
- " Casing => %c," & |
262 |
- " Dot_Replacement => ""%d"");"; |
263 |
- for Config_File_Unique ("Ada") use "False"; |
264 |
- for PIC_Option ("Ada") use ("-fPIC"); |
265 |
- for Leading_Required_Switches ("Ada") use |
266 |
- Compiler'Leading_Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); |
267 |
- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; |
268 |
- for Leading_Required_Switches ("C") use |
269 |
- ("-c", "-x", "c") & Compiler'Leading_Required_Switches ("C"); |
270 |
- for Include_Switches_Via_Spec ("C") use ("cc1", "-I"); |
271 |
- for Max_Command_Line_Length use "8192"; |
272 |
- for Response_File_Format ("C") use "GCC_GNU"; |
273 |
- for Dependency_Switches ("C") use ("-MMD", "-MF", ""); |
274 |
- for PIC_Option ("C") use ("-fPIC"); |
275 |
- end Compiler; |
276 |
- |
277 |
- package Binder is |
278 |
- for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; |
279 |
- for Driver ("Ada") use |
280 |
- "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; |
281 |
- for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@"); |
282 |
- for Required_Switches ("Ada") use |
283 |
- Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); |
284 |
- end Binder; |
285 |
- |
286 |
- for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; |
287 |
- |
288 |
-for Runtime_Dir ("Ada") use "${RUNTIME_DIR(ada)}"; |
289 |
- for Library_Encapsulated_Supported use "true"; |
290 |
- </config> |
291 |
- </configuration> |
292 |
-</gprconfig> |
293 |
|
294 |
diff --git a/dev-ada/gprbuild/gprbuild-2018-r1.ebuild b/dev-ada/gprbuild/gprbuild-2018-r2.ebuild |
295 |
similarity index 91% |
296 |
rename from dev-ada/gprbuild/gprbuild-2018-r1.ebuild |
297 |
rename to dev-ada/gprbuild/gprbuild-2018-r2.ebuild |
298 |
index 3f325332e8e..91e3da95792 100644 |
299 |
--- a/dev-ada/gprbuild/gprbuild-2018-r1.ebuild |
300 |
+++ b/dev-ada/gprbuild/gprbuild-2018-r2.ebuild |
301 |
@@ -37,17 +37,22 @@ src_prepare() { |
302 |
else |
303 |
GCC_PV=7.3.1 |
304 |
fi |
305 |
- sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml |
306 |
- rm share/gprconfig/c.xml || die |
307 |
default |
308 |
sed -i \ |
309 |
- -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ |
310 |
- src/gprlib.adb \ |
311 |
+ -e "s:@VER@:${GCC_PV}:g" \ |
312 |
+ share/gprconfig/compilers.xml \ |
313 |
+ share/gprconfig/gnat.xml \ |
314 |
+ share/gprconfig/c.xml \ |
315 |
+ share/gprconfig/linker.xml \ |
316 |
|| die |
317 |
sed -i \ |
318 |
- -e "s:\"-Wl,-r\":\"-r\":g" \ |
319 |
- share/gprconfig/linker.xml \ |
320 |
+ -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ |
321 |
+ src/gprlib.adb \ |
322 |
|| die |
323 |
+# sed -i \ |
324 |
+# -e "s:\"-Wl,-r\":\"-r\":g" \ |
325 |
+# share/gprconfig/linker.xml \ |
326 |
+# || die |
327 |
} |
328 |
|
329 |
src_configure() { |
330 |
@@ -84,6 +89,5 @@ src_install() { |
331 |
insinto /usr/share/gpr |
332 |
doins share/_default.gpr |
333 |
insinto /usr/share/gprconfig |
334 |
- doins gnat-${GCC_PV}.xml |
335 |
einstalldocs |
336 |
} |