Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/gnat_util/files/, dev-ada/gnat_util/
Date: Wed, 28 Jun 2017 20:16:47
Message-Id: 1498680974.1768732cd0b4449a50874131b7b583f7617c5bf9.tupone@gentoo
1 commit: 1768732cd0b4449a50874131b7b583f7617c5bf9
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 28 20:16:14 2017 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 28 20:16:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1768732c
7
8 dev-ada/gnat_util: Add version 2017
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 dev-ada/gnat_util/Manifest | 1 +
13 .../gnat_util/files/gnat_util-2017-gentoo.patch | 80 ++++++++++++++++++++++
14 dev-ada/gnat_util/gnat_util-2016.ebuild | 30 ++++----
15 ...gnat_util-2016.ebuild => gnat_util-2017.ebuild} | 33 +++++----
16 dev-ada/gnat_util/metadata.xml | 2 +
17 5 files changed, 113 insertions(+), 33 deletions(-)
18
19 diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
20 index 74f186b9a0a..48970740db2 100644
21 --- a/dev-ada/gnat_util/Manifest
22 +++ b/dev-ada/gnat_util/Manifest
23 @@ -1 +1,2 @@
24 DIST gnat_util-gpl-2016-src.tar.gz 1126296 SHA256 8e76d7eb1cbae1d3040b9e4196ab07d6e0dd5d4eeb3f5e0fbeb267b1a3470af5 SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0 WHIRLPOOL c2218ba14f669aa2412be4e0a42b1ffb475c720e608e73bca3bbe42dcaefe2dc4410c4632e0e900a8c72ed92c3ec670bd35935783f43c1eb0eb2cdb7afc4f63e
25 +DIST gnat_util-gpl-2017-src.tar.gz 868496 SHA256 46910f4248ebbb6cae5e576cae766768d376fdbf459c55f7efca9ea10d4ea8ad SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a WHIRLPOOL 9db8569a56e5ca61ba9cc76276838bb82b07bd1cf9357540d2716136df85a85144eb4f93c2d8336a67b071cf07dfb7b3c0197a0010442b9d1b65471c057cd0b9
26
27 diff --git a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
28 new file mode 100644
29 index 00000000000..50f74d3a138
30 --- /dev/null
31 +++ b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
32 @@ -0,0 +1,80 @@
33 +--- gnat_util-gpl-2014-src/Makefile.old 2016-12-28 09:56:49.378950217 +0100
34 ++++ gnat_util-gpl-2014-src/Makefile 2016-12-28 09:57:12.301562519 +0100
35 +@@ -21,21 +21,30 @@
36 +
37 + .PHONY: all
38 + all: generate_sources
39 +- ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
40 +- -XLIBRARY_TYPE=static -Pgnat_util -p
41 ++ $(MAKE) build-static
42 + ifeq ($(ENABLE_SHARED), yes)
43 +- ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
44 +- -XLIBRARY_TYPE=relocatable -Pgnat_util -p
45 ++ $(MAKE) build-shared
46 + endif
47 ++ $(MAKE) build-static-pic
48 ++build-static:
49 ++ ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
50 ++ -XLIBRARY_TYPE=static -Pgnat_util -p -XCC=${CC} \
51 ++ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
52 ++build-shared:
53 ++ ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
54 ++ -XLIBRARY_TYPE=relocatable -Pgnat_util -p -XCC=${CC} \
55 ++ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
56 ++build-static-pic:
57 + ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
58 +- -XLIBRARY_TYPE=static-pic -Pgnat_util -p
59 ++ -XLIBRARY_TYPE=static-pic -Pgnat_util -p -XCC=${CC} \
60 ++ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
61 +
62 + .PHONY: generate_sources
63 + generate_sources:
64 + $(MKDIR) $(SRC)
65 + $(CP) xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl snames.h-tmpl $(SRC)
66 + (cd $(SRC) && \
67 +- gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
68 ++ ${GNATMAKE} -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
69 + ./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb)
70 + $(CP) sdefault_adb.gnat_util $(SRC)/sdefault.adb
71 +
72 +@@ -47,6 +56,12 @@
73 +
74 + .PHONY: install
75 + install: install-clean
76 ++ ${MAKE} install-static
77 ++ifeq ($(ENABLE_SHARED), yes)
78 ++ ${MAKE} install-shared
79 ++endif
80 ++ ${MAKE} install-static-pic
81 ++install-static:
82 + ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
83 + -XLIBRARY_TYPE=static \
84 + --prefix=$(prefix) \
85 +@@ -54,7 +69,7 @@
86 + --lib-subdir=lib/gnat_util/static \
87 + --project-subdir=lib/gnat \
88 + --build-var=LIBRARY_TYPE --build-name=static -Pgnat_util
89 +-ifeq ($(ENABLE_SHARED), yes)
90 ++install-shared:
91 + ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
92 + -XLIBRARY_TYPE=relocatable \
93 + --prefix=$(prefix) \
94 +@@ -62,7 +77,7 @@
95 + --lib-subdir=lib/gnat_util/relocatable \
96 + --project-subdir=lib/gnat \
97 + --build-var=LIBRARY_TYPE --build-name=relocatable -Pgnat_util
98 +-endif
99 ++install-static-pic:
100 + ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
101 + -XLIBRARY_TYPE=static-pic \
102 + --prefix=$(prefix) \
103 +--- gnat_util-gpl-2016-src/gnat_util.gpr.old 2017-02-09 22:15:27.153827164 +0100
104 ++++ gnat_util-gpl-2016-src/gnat_util.gpr 2017-02-09 22:15:38.307627480 +0100
105 +@@ -31,6 +31,7 @@
106 + for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata");
107 + for Default_Switches ("C") use ("-g");
108 + end case;
109 ++ for Driver ("C") use External ("CC", "gcc");
110 + end Compiler;
111 +
112 + package Builder is
113
114 diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
115 index dd8a3f6cba1..f3a43667276 100644
116 --- a/dev-ada/gnat_util/gnat_util-2016.ebuild
117 +++ b/dev-ada/gnat_util/gnat_util-2016.ebuild
118 @@ -14,34 +14,32 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6 -> ${MYP}-s
119 LICENSE="GPL-3"
120 SLOT="0"
121 KEYWORDS="~amd64"
122 -IUSE="+shared static static-pic"
123 +IUSE="gnat_2016 gnat_2017 +shared static static-pic"
124
125 -RDEPEND="dev-lang/gnat-gpl"
126 +RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
127 + gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
128 DEPEND="${RDEPEND}
129 - dev-ada/gprbuild"
130 + dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
131 +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
132
133 S="${WORKDIR}"/${MYP}-src
134
135 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
136
137 -pkg_setup() {
138 - GCC=${ADA:-$(tc-getCC)}
139 - GNATMAKE="${GCC/gcc/gnatmake}"
140 - CC="${GCC}"
141 - if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
142 - eerror "You need a gcc compiler that provides the Ada Compiler:"
143 - eerror "1) use gcc-config to select the right compiler or"
144 - eerror "2) set ADA=gcc-4.9.4 in make.conf"
145 - die "ada compiler not available"
146 - fi
147 -}
148 -
149 src_compile() {
150 + if use gnat_2016; then
151 + GCC_PV=4.9.4
152 + else
153 + GCC_PV=6.3.0
154 + fi
155 + GCC=${CHOST}-gcc-${GCC_PV}
156 + GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
157 emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
158 BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
159 for kind in shared static static-pic; do
160 if use ${kind}; then
161 - emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-${kind}
162 + emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
163 + build-${kind}
164 fi
165 done
166 }
167
168 diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
169 similarity index 57%
170 copy from dev-ada/gnat_util/gnat_util-2016.ebuild
171 copy to dev-ada/gnat_util/gnat_util-2017.ebuild
172 index dd8a3f6cba1..90558f72e05 100644
173 --- a/dev-ada/gnat_util/gnat_util-2016.ebuild
174 +++ b/dev-ada/gnat_util/gnat_util-2017.ebuild
175 @@ -9,39 +9,38 @@ MYP=${PN}-gpl-${PV}
176
177 DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
178 HOMEPAGE="http://libre.adacore.com"
179 -SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6 -> ${MYP}-src.tar.gz"
180 +SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
181 + -> ${MYP}-src.tar.gz"
182
183 LICENSE="GPL-3"
184 SLOT="0"
185 KEYWORDS="~amd64"
186 -IUSE="+shared static static-pic"
187 +IUSE="gnat_2016 gnat_2017 +shared static static-pic"
188
189 -RDEPEND="dev-lang/gnat-gpl"
190 +RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
191 + gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
192 DEPEND="${RDEPEND}
193 - dev-ada/gprbuild"
194 + dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
195 +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
196
197 S="${WORKDIR}"/${MYP}-src
198
199 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
200
201 -pkg_setup() {
202 - GCC=${ADA:-$(tc-getCC)}
203 - GNATMAKE="${GCC/gcc/gnatmake}"
204 - CC="${GCC}"
205 - if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
206 - eerror "You need a gcc compiler that provides the Ada Compiler:"
207 - eerror "1) use gcc-config to select the right compiler or"
208 - eerror "2) set ADA=gcc-4.9.4 in make.conf"
209 - die "ada compiler not available"
210 - fi
211 -}
212 -
213 src_compile() {
214 + if use gnat_2016; then
215 + GCC_PV=4.9.4
216 + else
217 + GCC_PV=6.3.0
218 + fi
219 + GCC=${CHOST}-gcc-${GCC_PV}
220 + GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
221 emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
222 BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
223 for kind in shared static static-pic; do
224 if use ${kind}; then
225 - emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-${kind}
226 + emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
227 + build-${kind}
228 fi
229 done
230 }
231
232 diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
233 index 06e6729dec8..22a3c1f31fe 100644
234 --- a/dev-ada/gnat_util/metadata.xml
235 +++ b/dev-ada/gnat_util/metadata.xml
236 @@ -6,6 +6,8 @@
237 <name>Tupone Alfredo</name>
238 </maintainer>
239 <use>
240 + <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
241 + <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
242 <flag name="shared">Build gnat_util shared library</flag>
243 <flag name="static">Build gnat_util static library</flag>
244 <flag name="static-pic">Build gnat_util static library with pic code</flag>
Report Message
Find on MARC Find on Google Groups