1 |
commit: e7d7485e2922d66450f2cecbc8967f81f168646b |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 27 20:27:04 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 27 20:27:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d7485e |
7 |
|
8 |
dev-ada/gprbuild: Fix configuration for 2017 version too |
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-2017-config.patch | 113 ++++++++++++++++++++++ |
14 |
dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 89 +++++++++++++++++ |
15 |
2 files changed, 202 insertions(+) |
16 |
|
17 |
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..72f1fd829c1 |
20 |
--- /dev/null |
21 |
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch |
22 |
@@ -0,0 +1,113 @@ |
23 |
+--- a/share/gprconfig/compilers.xml 2018-10-27 09:04:53.830077299 +0200 |
24 |
++++ b/share/gprconfig/compilers.xml 2018-10-27 09:05:14.883724079 +0200 |
25 |
+@@ -20,15 +20,15 @@ |
26 |
+ <!-- GCC 3.x & 4.x (not for GNAT Pro)--> |
27 |
+ <compiler_description> |
28 |
+ <name>GCC</name> |
29 |
+- <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> |
30 |
++ <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> |
31 |
+ <version> |
32 |
+- <external>${PREFIX}gcc -v</external> |
33 |
++ <external>${PREFIX}gcc-@VER@ -v</external> |
34 |
+ <nogrep regexp="for GNAT Pro"></nogrep> |
35 |
+ <grep regexp="^gcc \S+ (\S+)" group="1"></grep> |
36 |
+ </version> |
37 |
+ <languages>C</languages> |
38 |
+ <target> |
39 |
+- <external>${PREFIX}gcc -dumpmachine</external> |
40 |
++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> |
41 |
+ <grep regexp="[^\r\n]+"></grep> |
42 |
+ </target> |
43 |
+ </compiler_description> |
44 |
+@@ -325,14 +325,14 @@ |
45 |
+ --> |
46 |
+ <compiler_description> |
47 |
+ <name>GNAT</name> |
48 |
+- <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-)?gnatls</executable> |
49 |
++ <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-)?gnatls-@VER@</executable> |
50 |
+ <version> |
51 |
+- <external>${PREFIX}gnatls -v --version</external> |
52 |
++ <external>${PREFIX}gnatls-@VER@ -v --version</external> |
53 |
+ <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> |
54 |
+ </version> |
55 |
+ <languages>Ada</languages> |
56 |
+ <variable name="gcc_version"> |
57 |
+- <external>${PREFIX}gcc -v</external> |
58 |
++ <external>${PREFIX}gcc-@VER@ -v</external> |
59 |
+ <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> |
60 |
+ </variable> |
61 |
+ <runtimes default="default,kernel,native"> |
62 |
+@@ -342,7 +342,7 @@ |
63 |
+ <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory> |
64 |
+ </runtimes> |
65 |
+ <target> |
66 |
+- <external>${PREFIX}gcc -dumpmachine</external> |
67 |
++ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> |
68 |
+ <grep regexp="[^\r\n]+"></grep> |
69 |
+ </target> |
70 |
+ </compiler_description> |
71 |
+@@ -509,21 +509,6 @@ |
72 |
+ </target> |
73 |
+ </compiler_description> |
74 |
+ |
75 |
+- <!-- LLVM Compiler --> |
76 |
+- <compiler_description> |
77 |
+- <name>LLVM</name> |
78 |
+- <executable>clang</executable> |
79 |
+- <version> |
80 |
+- <external>clang -v</external> |
81 |
+- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep> |
82 |
+- </version> |
83 |
+- <languages>C</languages> |
84 |
+- <target> |
85 |
+- <external>clang -dumpmachine</external> |
86 |
+- <grep regexp="[^\r\n]+"></grep> |
87 |
+- </target> |
88 |
+- </compiler_description> |
89 |
+- |
90 |
+ <!-- Windres compiler --> |
91 |
+ <compiler_description> |
92 |
+ <name>WINDRES</name> |
93 |
+--- a/share/gprconfig/gnat.xml 2018-10-27 09:38:31.615357671 +0200 |
94 |
++++ b/share/gprconfig/gnat.xml 2018-10-27 09:40:54.603044560 +0200 |
95 |
+@@ -60,7 +60,7 @@ |
96 |
+ &filter_gnat; |
97 |
+ <config> |
98 |
+ package Compiler is |
99 |
+- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; |
100 |
++ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; |
101 |
+ for Language_Kind ("Ada") use "unit_based"; |
102 |
+ for Dependency_Kind ("Ada") use "ALI_File"; |
103 |
+ for Leading_Required_Switches ("Ada") use |
104 |
+@@ -77,6 +77,9 @@ |
105 |
+ for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; |
106 |
+ for Driver ("Ada") use |
107 |
+ "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; |
108 |
++ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@"); |
109 |
++ for Required_Switches ("Ada") use |
110 |
++ Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); |
111 |
+ end Binder; |
112 |
+ |
113 |
+ for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; |
114 |
+--- a/share/gprconfig/c.xml 2018-10-27 09:42:01.327035277 +0200 |
115 |
++++ b/share/gprconfig/c.xml 2018-10-27 09:42:16.529803718 +0200 |
116 |
+@@ -14,7 +14,7 @@ |
117 |
+ </compilers> |
118 |
+ <config> |
119 |
+ package Compiler is |
120 |
+- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; |
121 |
++ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; |
122 |
+ end Compiler; |
123 |
+ </config> |
124 |
+ </configuration> |
125 |
+--- a/share/gprconfig/linker.xml 2018-10-27 09:43:17.934862859 +0200 |
126 |
++++ b/share/gprconfig/linker.xml 2018-10-27 09:43:54.127304471 +0200 |
127 |
+@@ -742,7 +742,7 @@ |
128 |
+ for Shared_Library_Suffix use ".sl"; |
129 |
+ for Library_Auto_Init_Supported use "true"; |
130 |
+ for Run_Path_Option use ("-Wl,+b,"); |
131 |
+- for Library_Partial_Linker use ("gcc", "-nostdlib", "-Wl,-r", "-o"); |
132 |
++ for Library_Partial_Linker use ("gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); |
133 |
+ |
134 |
+ package Linker is |
135 |
+ for Max_Command_Line_Length use "5000"; |
136 |
|
137 |
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild |
138 |
new file mode 100644 |
139 |
index 00000000000..1f443284e87 |
140 |
--- /dev/null |
141 |
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild |
142 |
@@ -0,0 +1,89 @@ |
143 |
+# Copyright 1999-2018 Gentoo Authors |
144 |
+# Distributed under the terms of the GNU General Public License v2 |
145 |
+ |
146 |
+EAPI=6 |
147 |
+ |
148 |
+inherit toolchain-funcs multiprocessing |
149 |
+ |
150 |
+MYP=${PN}-gpl-${PV} |
151 |
+ |
152 |
+DESCRIPTION="Multi-Language Management" |
153 |
+HOMEPAGE="http://libre.adacore.com/" |
154 |
+SRC_URI=" |
155 |
+ http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 |
156 |
+ -> ${MYP}-src.tar.gz |
157 |
+ http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 |
158 |
+ -> xmlada-gpl-${PV}-src.tar.gz" |
159 |
+LICENSE="GPL-3" |
160 |
+SLOT="0" |
161 |
+KEYWORDS="~amd64 ~x86" |
162 |
+IUSE="gnat_2016 +gnat_2017 gnat_2018" |
163 |
+ |
164 |
+DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
165 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" |
166 |
+RDEPEND="${DEPEND}" |
167 |
+ |
168 |
+S="${WORKDIR}"/${MYP}-src |
169 |
+ |
170 |
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" |
171 |
+ |
172 |
+PATCHES=( |
173 |
+ "${FILESDIR}"/${P}-gentoo.patch |
174 |
+ "${FILESDIR}"/${P}-config.patch |
175 |
+) |
176 |
+ |
177 |
+src_prepare() { |
178 |
+ if use gnat_2016; then |
179 |
+ GCC_PV=4.9.4 |
180 |
+ else |
181 |
+ GCC_PV=6.3.0 |
182 |
+ fi |
183 |
+ default |
184 |
+ sed -i \ |
185 |
+ -e "s:@VER@:${GCC_PV}:g" \ |
186 |
+ share/gprconfig/compilers.xml \ |
187 |
+ share/gprconfig/gnat.xml \ |
188 |
+ share/gprconfig/c.xml \ |
189 |
+ share/gprconfig/linker.xml \ |
190 |
+ || die |
191 |
+ sed -i \ |
192 |
+ -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ |
193 |
+ src/gprlib.adb \ |
194 |
+ || die |
195 |
+} |
196 |
+ |
197 |
+src_configure() { |
198 |
+ emake prefix="${D}"usr setup |
199 |
+} |
200 |
+ |
201 |
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" |
202 |
+lib_progs="gprlib gprbind" |
203 |
+ |
204 |
+src_compile() { |
205 |
+ GCC=${CHOST}-gcc-${GCC_PV} |
206 |
+ GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
207 |
+ local xmlada_src="../xmlada-gpl-${PV}-src" |
208 |
+ incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \ |
209 |
+ -I${xmlada_src}/schema -I${xmlada_src}/unicode \ |
210 |
+ -I${xmlada_src}/input_sources" |
211 |
+ ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die |
212 |
+ for bin in ${bin_progs}; do |
213 |
+ ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ |
214 |
+ -o ${bin} -largs gpr_imports.o || die |
215 |
+ done |
216 |
+ for lib in $lib_progs; do |
217 |
+ ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ |
218 |
+ -largs gpr_imports.o || die |
219 |
+ done |
220 |
+} |
221 |
+ |
222 |
+src_install() { |
223 |
+ dobin ${bin_progs} |
224 |
+ exeinto /usr/libexec/gprbuild |
225 |
+ doexe ${lib_progs} |
226 |
+ insinto /usr/share/gprconfig |
227 |
+ doins share/gprconfig/* |
228 |
+ insinto /usr/share/gpr |
229 |
+ doins share/_default.gpr |
230 |
+ einstalldocs |
231 |
+} |