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

Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/sdcc/
Date: Thu, 01 Nov 2018 16:02:15
Message-Id: 1541088126.5a8cba4b1b5681b0db6286f3747df7b4be3b2360.jer@gentoo
1 commit: 5a8cba4b1b5681b0db6286f3747df7b4be3b2360
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 1 16:01:49 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 1 16:02:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8cba4b
7
8 dev-embedded/sdcc: Version 3.8.0
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 dev-embedded/sdcc/Manifest | 2 +
14 dev-embedded/sdcc/metadata.xml | 8 +-
15 .../sdcc/{sdcc-9999.ebuild => sdcc-3.8.0.ebuild} | 98 +++++++++++++---------
16 dev-embedded/sdcc/sdcc-9999.ebuild | 98 +++++++++++++---------
17 4 files changed, 125 insertions(+), 81 deletions(-)
18
19 diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
20 index ab1a89d8386..ce848d246fa 100644
21 --- a/dev-embedded/sdcc/Manifest
22 +++ b/dev-embedded/sdcc/Manifest
23 @@ -1,2 +1,4 @@
24 DIST sdcc-doc-3.5.0.tar.bz2 1000775 BLAKE2B 30cd31990788060ebc792d98b072d4d72ce72176bf09374084246bfe02a8164ab083fb9cfe7fb6ee246b523dce7163d494f2161eb7537f972408f03bc9541426 SHA512 43de0c19ad538b4495218b04e5ab6a886fd9945c8a82c400e9a53314547f5d6ab0529989274faecc2d954f35f8fe60f338f09f93536b62a305203d2119df597e
25 +DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
26 DIST sdcc-src-3.5.0.tar.bz2 10504517 BLAKE2B 16102ebd55026826100b453db20e00fa599ce6ad72f1466c32deb7211f09188048f35ac8ddd5987b7a3ad5fad79f2e2ee833da60e22a26b107c5e9e0e7c9be09 SHA512 a5842945da065ab566b7e073782e92f851da48c160990d49b76ab4773fe1c14286cab399fb7f2456432e4043ee7ce07c3b149aeb103c51f85a33fdc5f8798f4e
27 +DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
28
29 diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
30 index c0f3e2174ed..6d9caa8c84a 100644
31 --- a/dev-embedded/sdcc/metadata.xml
32 +++ b/dev-embedded/sdcc/metadata.xml
33 @@ -6,12 +6,18 @@
34 <name>Embedded Gentoo</name>
35 </maintainer>
36 <longdescription>
37 -SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based (hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. It can be retargeted for other microprocessors.
38 +SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the
39 +Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
40 +(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based
41 +(hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit
42 +3000A, TLCS-90) and STMicroelectronics STM8. It can be retargeted for other
43 +microprocessors.
44 </longdescription>
45 <upstream>
46 <remote-id type="sourceforge">sdcc</remote-id>
47 </upstream>
48 <use>
49 + <flag name="avr">Add support for AVR -- not supported upstream</flag>
50 <flag name="boehm-gc">Enable Hans Boehm's garbage collector <pkg>dev-libs/boehm-gc</pkg></flag>
51 <flag name="device-lib">Enable built of devices libraries</flag>
52 <flag name="ds390">Add support for Dallas DS390</flag>
53
54 diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
55 similarity index 72%
56 copy from dev-embedded/sdcc/sdcc-9999.ebuild
57 copy to dev-embedded/sdcc/sdcc-3.8.0.ebuild
58 index e0d3b94b8ec..8db064b0f82 100644
59 --- a/dev-embedded/sdcc/sdcc-9999.ebuild
60 +++ b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
61 @@ -1,9 +1,8 @@
62 -# Copyright 1999-2016 Gentoo Foundation
63 +# Copyright 1999-2018 Gentoo Authors
64 # Distributed under the terms of the GNU General Public License v2
65
66 -EAPI="5"
67 -
68 -inherit eutils toolchain-funcs
69 +EAPI=6
70 +inherit toolchain-funcs
71
72 if [[ ${PV} == "9999" ]] ; then
73 ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
74 @@ -19,36 +18,51 @@ fi
75 DESCRIPTION="Small device C compiler (for various microprocessors)"
76 HOMEPAGE="http://sdcc.sourceforge.net/"
77
78 -LICENSE="GPL-2 ZLIB
79 +LICENSE="
80 + GPL-2 ZLIB
81 non-free? ( MicroChip-SDCC )
82 - packihx? ( public-domain )"
83 + packihx? ( public-domain )
84 +"
85 SLOT="0"
86 -IUSE="mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
87 -ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc"
88 +SDCC_PORTS="
89 + avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180
90 + z80
91 +"
92 +IUSE="
93 + ${SDCC_PORTS}
94 + +boehm-gc device-lib doc non-free packihx sdbinutils sdcdb +sdcpp ucsim
95 +"
96
97 REQUIRED_USE="
98 - mcs51? ( sdbinutils )
99 ds390? ( sdbinutils )
100 ds400? ( sdbinutils )
101 hc08? ( sdbinutils )
102 - s08? ( sdbinutils )"
103 + mcs51? ( sdbinutils )
104 + s08? ( sdbinutils )
105 + || ( ${SDCC_PORTS} )
106 +"
107
108 RESTRICT="strip"
109
110 -RDEPEND="dev-libs/boost:=
111 +RDEPEND="
112 + dev-libs/boost:=
113 sys-libs/ncurses:=
114 sys-libs/readline:0=
115 >=dev-embedded/gputils-0.13.7
116 boehm-gc? ( dev-libs/boehm-gc:= )
117 - !dev-embedded/sdcc-svn"
118 -DEPEND="${RDEPEND}
119 - dev-util/gperf"
120 + !dev-embedded/sdcc-svn
121 +"
122 +DEPEND="
123 + ${RDEPEND}
124 + dev-util/gperf
125 +"
126 if docs_compile ; then
127 - DEPEND+="
128 - doc? (
129 - >=app-office/lyx-1.3.4
130 - dev-tex/latex2html
131 - )"
132 +DEPEND+="
133 + doc? (
134 + >=app-office/lyx-1.3.4
135 + dev-tex/latex2html
136 + )
137 +"
138 fi
139
140 src_prepare() {
141 @@ -60,13 +74,15 @@ src_prepare() {
142 {} + || die
143
144 # https://sourceforge.net/p/sdcc/bugs/2398/
145 - sed -i '1iAR = @AR@' Makefile.common.in || die
146 + sed -i -e '1iAR = @AR@' Makefile.common.in || die
147 sed -i \
148 -e "/^AR =/s:=.*:=$(tc-getAR):" \
149 support/cpp/Makefile.in || die
150
151 # Make sure timestamps don't get messed up.
152 [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
153 +
154 + default
155 }
156
157 src_configure() {
158 @@ -76,31 +92,32 @@ src_configure() {
159 ac_cv_prog_STRIP=true \
160 ac_cv_prog_AS="$(tc-getAS)" \
161 ac_cv_prog_AR="$(tc-getAR)" \
162 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
163 - --without-ccache \
164 - $(use_enable mcs51 mcs51-port) \
165 - $(use_enable z80 z80-port) \
166 - $(use_enable z180 z180-port) \
167 - $(use_enable r2k r2k-port) \
168 - $(use_enable r3ka r3ka-port) \
169 - $(use_enable gbz80 gbz80-port) \
170 - $(use_enable tlcs90 tlcs90-port) \
171 + $(docs_compile && use_enable doc || echo --disable-doc) \
172 + $(use_enable avr avr-port) \
173 + $(use_enable boehm-gc libgc) \
174 + $(use_enable device-lib) \
175 $(use_enable ds390 ds390-port) \
176 $(use_enable ds400 ds400-port) \
177 + $(use_enable gbz80 gbz80-port) \
178 + $(use_enable hc08 hc08-port) \
179 + $(use_enable mcs51 mcs51-port) \
180 + $(use_enable non-free) \
181 + $(use_enable packihx) \
182 $(use_enable pic14 pic14-port) \
183 $(use_enable pic16 pic16-port) \
184 - $(use_enable hc08 hc08-port) \
185 + $(use_enable r2k r2k-port) \
186 + $(use_enable r3ka r3ka-port) \
187 $(use_enable s08 s08-port) \
188 + $(use_enable sdbinutils) \
189 + $(use_enable sdcdb) \
190 + $(use_enable sdcpp) \
191 $(use_enable stm8 stm8-port) \
192 - $(use_enable ucsim ucsim) \
193 - $(use_enable device-lib device-lib) \
194 - $(use_enable packihx packihx) \
195 - $(use_enable sdcpp sdcpp) \
196 - $(use_enable sdcdb sdcdb) \
197 - $(use_enable sdbinutils sdbinutils) \
198 - $(use_enable non-free non-free) \
199 - $(use_enable boehm-gc libgc) \
200 - $(docs_compile && use_enable doc || echo --disable-doc)
201 + $(use_enable tlcs90 tlcs90-port) \
202 + $(use_enable ucsim) \
203 + $(use_enable z180 z180-port) \
204 + $(use_enable z80 z80-port) \
205 + --docdir="${EPREFIX}/usr/share/doc/${PF}" \
206 + --without-ccache
207 }
208
209 src_install() {
210 @@ -110,7 +127,8 @@ src_install() {
211
212 if use doc ; then
213 docs_compile || cd "${WORKDIR}"/doc
214 - dohtml -r *
215 + docinto html
216 + doins -r *
217 fi
218
219 # a bunch of archives (*.a) are built & installed by gputils
220
221 diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
222 index e0d3b94b8ec..8db064b0f82 100644
223 --- a/dev-embedded/sdcc/sdcc-9999.ebuild
224 +++ b/dev-embedded/sdcc/sdcc-9999.ebuild
225 @@ -1,9 +1,8 @@
226 -# Copyright 1999-2016 Gentoo Foundation
227 +# Copyright 1999-2018 Gentoo Authors
228 # Distributed under the terms of the GNU General Public License v2
229
230 -EAPI="5"
231 -
232 -inherit eutils toolchain-funcs
233 +EAPI=6
234 +inherit toolchain-funcs
235
236 if [[ ${PV} == "9999" ]] ; then
237 ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
238 @@ -19,36 +18,51 @@ fi
239 DESCRIPTION="Small device C compiler (for various microprocessors)"
240 HOMEPAGE="http://sdcc.sourceforge.net/"
241
242 -LICENSE="GPL-2 ZLIB
243 +LICENSE="
244 + GPL-2 ZLIB
245 non-free? ( MicroChip-SDCC )
246 - packihx? ( public-domain )"
247 + packihx? ( public-domain )
248 +"
249 SLOT="0"
250 -IUSE="mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
251 -ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc"
252 +SDCC_PORTS="
253 + avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180
254 + z80
255 +"
256 +IUSE="
257 + ${SDCC_PORTS}
258 + +boehm-gc device-lib doc non-free packihx sdbinutils sdcdb +sdcpp ucsim
259 +"
260
261 REQUIRED_USE="
262 - mcs51? ( sdbinutils )
263 ds390? ( sdbinutils )
264 ds400? ( sdbinutils )
265 hc08? ( sdbinutils )
266 - s08? ( sdbinutils )"
267 + mcs51? ( sdbinutils )
268 + s08? ( sdbinutils )
269 + || ( ${SDCC_PORTS} )
270 +"
271
272 RESTRICT="strip"
273
274 -RDEPEND="dev-libs/boost:=
275 +RDEPEND="
276 + dev-libs/boost:=
277 sys-libs/ncurses:=
278 sys-libs/readline:0=
279 >=dev-embedded/gputils-0.13.7
280 boehm-gc? ( dev-libs/boehm-gc:= )
281 - !dev-embedded/sdcc-svn"
282 -DEPEND="${RDEPEND}
283 - dev-util/gperf"
284 + !dev-embedded/sdcc-svn
285 +"
286 +DEPEND="
287 + ${RDEPEND}
288 + dev-util/gperf
289 +"
290 if docs_compile ; then
291 - DEPEND+="
292 - doc? (
293 - >=app-office/lyx-1.3.4
294 - dev-tex/latex2html
295 - )"
296 +DEPEND+="
297 + doc? (
298 + >=app-office/lyx-1.3.4
299 + dev-tex/latex2html
300 + )
301 +"
302 fi
303
304 src_prepare() {
305 @@ -60,13 +74,15 @@ src_prepare() {
306 {} + || die
307
308 # https://sourceforge.net/p/sdcc/bugs/2398/
309 - sed -i '1iAR = @AR@' Makefile.common.in || die
310 + sed -i -e '1iAR = @AR@' Makefile.common.in || die
311 sed -i \
312 -e "/^AR =/s:=.*:=$(tc-getAR):" \
313 support/cpp/Makefile.in || die
314
315 # Make sure timestamps don't get messed up.
316 [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
317 +
318 + default
319 }
320
321 src_configure() {
322 @@ -76,31 +92,32 @@ src_configure() {
323 ac_cv_prog_STRIP=true \
324 ac_cv_prog_AS="$(tc-getAS)" \
325 ac_cv_prog_AR="$(tc-getAR)" \
326 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
327 - --without-ccache \
328 - $(use_enable mcs51 mcs51-port) \
329 - $(use_enable z80 z80-port) \
330 - $(use_enable z180 z180-port) \
331 - $(use_enable r2k r2k-port) \
332 - $(use_enable r3ka r3ka-port) \
333 - $(use_enable gbz80 gbz80-port) \
334 - $(use_enable tlcs90 tlcs90-port) \
335 + $(docs_compile && use_enable doc || echo --disable-doc) \
336 + $(use_enable avr avr-port) \
337 + $(use_enable boehm-gc libgc) \
338 + $(use_enable device-lib) \
339 $(use_enable ds390 ds390-port) \
340 $(use_enable ds400 ds400-port) \
341 + $(use_enable gbz80 gbz80-port) \
342 + $(use_enable hc08 hc08-port) \
343 + $(use_enable mcs51 mcs51-port) \
344 + $(use_enable non-free) \
345 + $(use_enable packihx) \
346 $(use_enable pic14 pic14-port) \
347 $(use_enable pic16 pic16-port) \
348 - $(use_enable hc08 hc08-port) \
349 + $(use_enable r2k r2k-port) \
350 + $(use_enable r3ka r3ka-port) \
351 $(use_enable s08 s08-port) \
352 + $(use_enable sdbinutils) \
353 + $(use_enable sdcdb) \
354 + $(use_enable sdcpp) \
355 $(use_enable stm8 stm8-port) \
356 - $(use_enable ucsim ucsim) \
357 - $(use_enable device-lib device-lib) \
358 - $(use_enable packihx packihx) \
359 - $(use_enable sdcpp sdcpp) \
360 - $(use_enable sdcdb sdcdb) \
361 - $(use_enable sdbinutils sdbinutils) \
362 - $(use_enable non-free non-free) \
363 - $(use_enable boehm-gc libgc) \
364 - $(docs_compile && use_enable doc || echo --disable-doc)
365 + $(use_enable tlcs90 tlcs90-port) \
366 + $(use_enable ucsim) \
367 + $(use_enable z180 z180-port) \
368 + $(use_enable z80 z80-port) \
369 + --docdir="${EPREFIX}/usr/share/doc/${PF}" \
370 + --without-ccache
371 }
372
373 src_install() {
374 @@ -110,7 +127,8 @@ src_install() {
375
376 if use doc ; then
377 docs_compile || cd "${WORKDIR}"/doc
378 - dohtml -r *
379 + docinto html
380 + doins -r *
381 fi
382
383 # a bunch of archives (*.a) are built & installed by gputils
Report Message
Find on MARC Find on Google Groups