1 |
commit: f25254be26880ccbe2b130a46375b1eddc001d53 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 14 02:27:25 2021 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 14 02:27:25 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f25254be |
7 |
|
8 |
sys-devel{binutils/lld}: use ::gentoo, stacksize adjustment locally |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
sys-devel/binutils/Manifest | 4 - |
14 |
sys-devel/binutils/binutils-2.33.1-r1.ebuild | 439 --------------------- |
15 |
sys-devel/binutils/binutils-2.34-r2.ebuild | 436 -------------------- |
16 |
.../binutils/files/binutils-2.33-gcc-10.patch | 39 -- |
17 |
.../binutils/files/binutils-configure-LANG.patch | 65 --- |
18 |
sys-devel/binutils/metadata.xml | 17 - |
19 |
sys-devel/lld/Manifest | 3 - |
20 |
sys-devel/lld/lld-10.0.1-r1.ebuild | 52 --- |
21 |
sys-devel/lld/lld-11.1.0-r1.ebuild | 58 --- |
22 |
sys-devel/lld/lld-12.0.0.ebuild | 69 ---- |
23 |
sys-devel/lld/metadata.xml | 7 - |
24 |
11 files changed, 1189 deletions(-) |
25 |
|
26 |
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest |
27 |
deleted file mode 100644 |
28 |
index 1d49d57..0000000 |
29 |
--- a/sys-devel/binutils/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1,4 +0,0 @@ |
32 |
-DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d |
33 |
-DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac |
34 |
-DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d |
35 |
-DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd |
36 |
|
37 |
diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild |
38 |
deleted file mode 100644 |
39 |
index 6963e7e..0000000 |
40 |
--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild |
41 |
+++ /dev/null |
42 |
@@ -1,439 +0,0 @@ |
43 |
-# Copyright 1999-2020 Gentoo Authors |
44 |
-# Distributed under the terms of the GNU General Public License v2 |
45 |
- |
46 |
-EAPI=7 |
47 |
- |
48 |
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs |
49 |
- |
50 |
-DESCRIPTION="Tools necessary to build programs" |
51 |
-HOMEPAGE="https://sourceware.org/binutils/" |
52 |
-LICENSE="GPL-3+" |
53 |
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" |
54 |
-REQUIRED_USE="default-gold? ( gold )" |
55 |
- |
56 |
-# Variables that can be set here: |
57 |
-# PATCH_VER - the patchset version |
58 |
-# Default: empty, no patching |
59 |
-# PATCH_BINUTILS_VER - the binutils version in the patchset name |
60 |
-# - Default: PV |
61 |
-# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... |
62 |
-# for the patchsets |
63 |
- |
64 |
-PATCH_VER=2 |
65 |
-PATCH_DEV=slyfox |
66 |
- |
67 |
-case ${PV} in |
68 |
- 9999) |
69 |
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
70 |
- inherit git-r3 |
71 |
- S=${WORKDIR}/binutils |
72 |
- EGIT_CHECKOUT_DIR=${S} |
73 |
- SLOT=${PV} |
74 |
- ;; |
75 |
- *.9999) |
76 |
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
77 |
- inherit git-r3 |
78 |
- S=${WORKDIR}/binutils |
79 |
- EGIT_CHECKOUT_DIR=${S} |
80 |
- EGIT_BRANCH=$(ver_cut 1-2) |
81 |
- EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch" |
82 |
- SLOT=$(ver_cut 1-2) |
83 |
- ;; |
84 |
- *) |
85 |
- SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" |
86 |
- SLOT=$(ver_cut 1-2) |
87 |
- KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
88 |
- ;; |
89 |
-esac |
90 |
- |
91 |
-# |
92 |
-# The Gentoo patchset |
93 |
-# |
94 |
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} |
95 |
-PATCH_DEV=${PATCH_DEV:-slyfox} |
96 |
- |
97 |
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} |
98 |
- https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" |
99 |
- |
100 |
-# |
101 |
-# The cross-compile logic |
102 |
-# |
103 |
-export CTARGET=${CTARGET:-${CHOST}} |
104 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
105 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
106 |
- export CTARGET=${CATEGORY#cross-} |
107 |
- fi |
108 |
-fi |
109 |
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } |
110 |
- |
111 |
-# |
112 |
-# The dependencies |
113 |
-# |
114 |
-RDEPEND=" |
115 |
- >=sys-devel/binutils-config-3 |
116 |
- sys-libs/zlib |
117 |
-" |
118 |
-DEPEND="${RDEPEND} |
119 |
- doc? ( sys-apps/texinfo ) |
120 |
- test? ( dev-util/dejagnu ) |
121 |
- nls? ( sys-devel/gettext ) |
122 |
- sys-devel/flex |
123 |
- virtual/yacc |
124 |
-" |
125 |
- |
126 |
-RESTRICT="!test? ( test )" |
127 |
- |
128 |
-PATCHES=( |
129 |
- "${FILESDIR}"/${PN}-2.33-gcc-10.patch |
130 |
-) |
131 |
- |
132 |
-MY_BUILDDIR=${WORKDIR}/build |
133 |
- |
134 |
-src_unpack() { |
135 |
- case ${PV} in |
136 |
- *9999) |
137 |
- git-r3_src_unpack |
138 |
- ;; |
139 |
- *) |
140 |
- ;; |
141 |
- esac |
142 |
- default |
143 |
- mkdir -p "${MY_BUILDDIR}" |
144 |
-} |
145 |
- |
146 |
-src_prepare() { |
147 |
- if [[ ! -z ${PATCH_VER} ]] ; then |
148 |
- einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" |
149 |
- eapply "${WORKDIR}/patch"/*.patch |
150 |
- fi |
151 |
- |
152 |
- # This check should probably go somewhere else, like pkg_pretend. |
153 |
- if [[ ${CTARGET} == *-uclibc* ]] ; then |
154 |
- if grep -qs 'linux-gnu' "${S}"/ltconfig ; then |
155 |
- die "sorry, but this binutils doesn't yet support uClibc :(" |
156 |
- fi |
157 |
- fi |
158 |
- |
159 |
- # Make sure our explicit libdir paths don't get clobbered. #562460 |
160 |
- sed -i \ |
161 |
- -e 's:@bfdlibdir@:@libdir@:g' \ |
162 |
- -e 's:@bfdincludedir@:@includedir@:g' \ |
163 |
- {bfd,opcodes}/Makefile.in || die |
164 |
- |
165 |
- # Fix locale issues if possible #122216 |
166 |
- if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then |
167 |
- einfo "Fixing misc issues in configure files" |
168 |
- for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do |
169 |
- ebegin " Updating ${f/${S}\/}" |
170 |
- patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ |
171 |
- || eerror "Please file a bug about this" |
172 |
- eend $? |
173 |
- done |
174 |
- fi |
175 |
- |
176 |
- # Fix conflicts with newer glibc #272594 |
177 |
- if [[ -e libiberty/testsuite/test-demangle.c ]] ; then |
178 |
- sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c |
179 |
- fi |
180 |
- |
181 |
- # Apply things from PATCHES and user dirs |
182 |
- default |
183 |
- |
184 |
- # Run misc portage update scripts |
185 |
- gnuconfig_update |
186 |
- elibtoolize --portage --no-uclibc |
187 |
-} |
188 |
- |
189 |
-toolchain-binutils_bugurl() { |
190 |
- printf "https://bugs.gentoo.org/" |
191 |
-} |
192 |
-toolchain-binutils_pkgversion() { |
193 |
- printf "Gentoo ${PV}" |
194 |
- [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" |
195 |
-} |
196 |
- |
197 |
-src_configure() { |
198 |
- # Setup some paths |
199 |
- LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} |
200 |
- INCPATH=${LIBPATH}/include |
201 |
- DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} |
202 |
- if is_cross ; then |
203 |
- TOOLPATH=/usr/${CHOST}/${CTARGET} |
204 |
- else |
205 |
- TOOLPATH=/usr/${CTARGET} |
206 |
- fi |
207 |
- BINPATH=${TOOLPATH}/binutils-bin/${PV} |
208 |
- |
209 |
- # Make sure we filter $LINGUAS so that only ones that |
210 |
- # actually work make it through #42033 |
211 |
- strip-linguas -u */po |
212 |
- |
213 |
- # Keep things sane |
214 |
- strip-flags |
215 |
- |
216 |
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
217 |
- |
218 |
- local x |
219 |
- echo |
220 |
- for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do |
221 |
- einfo "$(printf '%10s' ${x}:) ${!x}" |
222 |
- done |
223 |
- echo |
224 |
- |
225 |
- cd "${MY_BUILDDIR}" |
226 |
- local myconf=() |
227 |
- |
228 |
- if use plugins ; then |
229 |
- myconf+=( --enable-plugins ) |
230 |
- fi |
231 |
- # enable gold (installed as ld.gold) and ld's plugin architecture |
232 |
- if use gold ; then |
233 |
- myconf+=( --enable-gold ) |
234 |
- if use default-gold; then |
235 |
- myconf+=( --enable-gold=default ) |
236 |
- fi |
237 |
- fi |
238 |
- |
239 |
- if use nls ; then |
240 |
- myconf+=( --without-included-gettext ) |
241 |
- else |
242 |
- myconf+=( --disable-nls ) |
243 |
- fi |
244 |
- |
245 |
- myconf+=( --with-system-zlib ) |
246 |
- |
247 |
- # For bi-arch systems, enable a 64bit bfd. This matches |
248 |
- # the bi-arch logic in toolchain.eclass. #446946 |
249 |
- # We used to do it for everyone, but it's slow on 32bit arches. #438522 |
250 |
- case $(tc-arch) in |
251 |
- ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; |
252 |
- esac |
253 |
- |
254 |
- use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) |
255 |
- |
256 |
- [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) |
257 |
- |
258 |
- is_cross && myconf+=( |
259 |
- --with-sysroot="${EPREFIX}"/usr/${CTARGET} |
260 |
- --enable-poison-system-directories |
261 |
- ) |
262 |
- |
263 |
- # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ |
264 |
- # on everyone in alpha (for now), we'll just enable it when possible |
265 |
- has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) |
266 |
- has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) |
267 |
- |
268 |
- # mips can't do hash-style=gnu ... |
269 |
- if [[ $(tc-arch) != mips ]] ; then |
270 |
- myconf+=( --enable-default-hash-style=gnu ) |
271 |
- fi |
272 |
- |
273 |
- myconf+=( |
274 |
- --prefix="${EPREFIX}"/usr |
275 |
- --host=${CHOST} |
276 |
- --target=${CTARGET} |
277 |
- --datadir="${EPREFIX}"${DATAPATH} |
278 |
- --datarootdir="${EPREFIX}"${DATAPATH} |
279 |
- --infodir="${EPREFIX}"${DATAPATH}/info |
280 |
- --mandir="${EPREFIX}"${DATAPATH}/man |
281 |
- --bindir="${EPREFIX}"${BINPATH} |
282 |
- --libdir="${EPREFIX}"${LIBPATH} |
283 |
- --libexecdir="${EPREFIX}"${LIBPATH} |
284 |
- --includedir="${EPREFIX}"${INCPATH} |
285 |
- --enable-obsolete |
286 |
- --enable-shared |
287 |
- --enable-threads |
288 |
- # Newer versions (>=2.27) offer a configure flag now. |
289 |
- --enable-relro |
290 |
- # Newer versions (>=2.24) make this an explicit option. #497268 |
291 |
- --enable-install-libiberty |
292 |
- --disable-werror |
293 |
- --with-bugurl="$(toolchain-binutils_bugurl)" |
294 |
- --with-pkgversion="$(toolchain-binutils_pkgversion)" |
295 |
- $(use_enable static-libs static) |
296 |
- ${EXTRA_ECONF} |
297 |
- # Disable modules that are in a combined binutils/gdb tree. #490566 |
298 |
- --disable-{gdb,libdecnumber,readline,sim} |
299 |
- # Strip out broken static link flags. |
300 |
- # https://gcc.gnu.org/PR56750 |
301 |
- --without-stage1-ldflags |
302 |
- # Change SONAME to avoid conflict across |
303 |
- # {native,cross}/binutils, binutils-libs. #666100 |
304 |
- --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st) |
305 |
- ) |
306 |
- echo ./configure "${myconf[@]}" |
307 |
- "${S}"/configure "${myconf[@]}" || die |
308 |
- |
309 |
- # Prevent makeinfo from running if doc is unset. |
310 |
- if ! use doc ; then |
311 |
- sed -i \ |
312 |
- -e '/^MAKEINFO/s:=.*:= true:' \ |
313 |
- Makefile || die |
314 |
- fi |
315 |
-} |
316 |
- |
317 |
-src_compile() { |
318 |
- cd "${MY_BUILDDIR}" |
319 |
- # see Note [tooldir hack for ldscripts] |
320 |
- emake tooldir="${EPREFIX}${TOOLPATH}" all |
321 |
- |
322 |
- # only build info pages if the user wants them |
323 |
- if use doc ; then |
324 |
- emake info |
325 |
- fi |
326 |
- |
327 |
- # we nuke the manpages when we're left with junk |
328 |
- # (like when we bootstrap, no perl -> no manpages) |
329 |
- find . -name '*.1' -a -size 0 -delete |
330 |
-} |
331 |
- |
332 |
-src_test() { |
333 |
- cd "${MY_BUILDDIR}" |
334 |
- |
335 |
- # bug 637066 |
336 |
- filter-flags -Wall -Wreturn-type |
337 |
- |
338 |
- emake -k check |
339 |
-} |
340 |
- |
341 |
-src_install() { |
342 |
- local x d |
343 |
- |
344 |
- cd "${MY_BUILDDIR}" |
345 |
- # see Note [tooldir hack for ldscripts] |
346 |
- emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install |
347 |
- rm -rf "${ED}"/${LIBPATH}/bin |
348 |
- use static-libs || find "${ED}" -name '*.la' -delete |
349 |
- |
350 |
- # Newer versions of binutils get fancy with ${LIBPATH} #171905 |
351 |
- cd "${ED}"/${LIBPATH} |
352 |
- for d in ../* ; do |
353 |
- [[ ${d} == ../${PV} ]] && continue |
354 |
- mv ${d}/* . || die |
355 |
- rmdir ${d} || die |
356 |
- done |
357 |
- |
358 |
- # Now we collect everything intp the proper SLOT-ed dirs |
359 |
- # When something is built to cross-compile, it installs into |
360 |
- # /usr/$CHOST/ by default ... we have to 'fix' that :) |
361 |
- if is_cross ; then |
362 |
- cd "${ED}"/${BINPATH} |
363 |
- for x in * ; do |
364 |
- mv ${x} ${x/${CTARGET}-} |
365 |
- done |
366 |
- |
367 |
- if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then |
368 |
- mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} |
369 |
- mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ |
370 |
- rm -r "${ED}"/usr/${CHOST}/{include,lib} |
371 |
- fi |
372 |
- fi |
373 |
- insinto ${INCPATH} |
374 |
- local libiberty_headers=( |
375 |
- # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. |
376 |
- demangle.h |
377 |
- dyn-string.h |
378 |
- fibheap.h |
379 |
- hashtab.h |
380 |
- libiberty.h |
381 |
- objalloc.h |
382 |
- splay-tree.h |
383 |
- ) |
384 |
- doins "${libiberty_headers[@]/#/${S}/include/}" |
385 |
- if [[ -d ${ED}/${LIBPATH}/lib ]] ; then |
386 |
- mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ |
387 |
- rm -r "${ED}"/${LIBPATH}/lib |
388 |
- fi |
389 |
- |
390 |
- # Generate an env.d entry for this binutils |
391 |
- insinto /etc/env.d/binutils |
392 |
- cat <<-EOF > "${T}"/env.d |
393 |
- TARGET="${CTARGET}" |
394 |
- VER="${PV}" |
395 |
- LIBPATH="${EPREFIX}${LIBPATH}" |
396 |
- EOF |
397 |
- newins "${T}"/env.d ${CTARGET}-${PV} |
398 |
- |
399 |
- # Handle documentation |
400 |
- if ! is_cross ; then |
401 |
- cd "${S}" |
402 |
- dodoc README |
403 |
- docinto bfd |
404 |
- dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO |
405 |
- docinto binutils |
406 |
- dodoc binutils/ChangeLog binutils/NEWS binutils/README |
407 |
- docinto gas |
408 |
- dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* |
409 |
- docinto gprof |
410 |
- dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl |
411 |
- docinto ld |
412 |
- dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO |
413 |
- docinto libiberty |
414 |
- dodoc libiberty/ChangeLog* libiberty/README |
415 |
- docinto opcodes |
416 |
- dodoc opcodes/ChangeLog* |
417 |
- fi |
418 |
- |
419 |
- # Remove shared info pages |
420 |
- rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} |
421 |
- |
422 |
- # Trim all empty dirs |
423 |
- find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null |
424 |
-} |
425 |
- |
426 |
-pkg_postinst() { |
427 |
- # Make sure this ${CTARGET} has a binutils version selected |
428 |
- [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 |
429 |
- binutils-config ${CTARGET}-${PV} |
430 |
-} |
431 |
- |
432 |
-pkg_postrm() { |
433 |
- local current_profile=$(binutils-config -c ${CTARGET}) |
434 |
- |
435 |
- # If no other versions exist, then uninstall for this |
436 |
- # target ... otherwise, switch to the newest version |
437 |
- # Note: only do this if this version is unmerged. We |
438 |
- # rerun binutils-config if this is a remerge, as |
439 |
- # we want the mtimes on the symlinks updated (if |
440 |
- # it is the same as the current selected profile) |
441 |
- if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then |
442 |
- local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') |
443 |
- choice=${choice//$'\n'/ } |
444 |
- choice=${choice/* } |
445 |
- if [[ -z ${choice} ]] ; then |
446 |
- binutils-config -u ${CTARGET} |
447 |
- else |
448 |
- binutils-config ${choice} |
449 |
- fi |
450 |
- elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then |
451 |
- binutils-config ${CTARGET}-${PV} |
452 |
- fi |
453 |
-} |
454 |
- |
455 |
-# Note [slotting support] |
456 |
-# ----------------------- |
457 |
-# Gentoo's layout for binutils files is non-standard as Gentoo |
458 |
-# supports slotted installation for binutils. Many tools |
459 |
-# still expect binutils to reside in known locations. |
460 |
-# binutils-config package restores symlinks into known locations, |
461 |
-# like: |
462 |
-# /usr/bin/${CTARGET}-<tool> |
463 |
-# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips |
464 |
-# /usr/include/ |
465 |
-# |
466 |
-# Note [tooldir hack for ldscripts] |
467 |
-# --------------------------------- |
468 |
-# Build system does not allow ./configure to tweak every location |
469 |
-# we need for slotting binutils hence all the shuffling in |
470 |
-# src_install(). This note is about SCRIPTDIR define handling. |
471 |
-# |
472 |
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value |
473 |
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' |
474 |
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. |
475 |
-# Thus we can't just move files around after compilation finished. |
476 |
-# |
477 |
-# Our goal is the following: |
478 |
-# - at build-time set scriptdir to point to symlinked location: |
479 |
-# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) |
480 |
-# - at install-time set scriptdir to point to slotted location: |
481 |
-# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} |
482 |
|
483 |
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild |
484 |
deleted file mode 100644 |
485 |
index 89699c5..0000000 |
486 |
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild |
487 |
+++ /dev/null |
488 |
@@ -1,436 +0,0 @@ |
489 |
-# Copyright 1999-2020 Gentoo Authors |
490 |
-# Distributed under the terms of the GNU General Public License v2 |
491 |
- |
492 |
-EAPI=7 |
493 |
- |
494 |
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs |
495 |
- |
496 |
-DESCRIPTION="Tools necessary to build programs" |
497 |
-HOMEPAGE="https://sourceware.org/binutils/" |
498 |
-LICENSE="GPL-3+" |
499 |
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" |
500 |
-REQUIRED_USE="default-gold? ( gold )" |
501 |
- |
502 |
-# Variables that can be set here: |
503 |
-# PATCH_VER - the patchset version |
504 |
-# Default: empty, no patching |
505 |
-# PATCH_BINUTILS_VER - the binutils version in the patchset name |
506 |
-# - Default: PV |
507 |
-# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... |
508 |
-# for the patchsets |
509 |
- |
510 |
-PATCH_VER=6 |
511 |
-PATCH_DEV=dilfridge |
512 |
- |
513 |
-case ${PV} in |
514 |
- 9999) |
515 |
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
516 |
- inherit git-r3 |
517 |
- S=${WORKDIR}/binutils |
518 |
- EGIT_CHECKOUT_DIR=${S} |
519 |
- SLOT=${PV} |
520 |
- ;; |
521 |
- *.9999) |
522 |
- EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
523 |
- inherit git-r3 |
524 |
- S=${WORKDIR}/binutils |
525 |
- EGIT_CHECKOUT_DIR=${S} |
526 |
- EGIT_BRANCH=$(ver_cut 1-2) |
527 |
- EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch" |
528 |
- SLOT=$(ver_cut 1-2) |
529 |
- ;; |
530 |
- *) |
531 |
- SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" |
532 |
- SLOT=$(ver_cut 1-2) |
533 |
- KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 x86" |
534 |
- ;; |
535 |
-esac |
536 |
- |
537 |
-# |
538 |
-# The Gentoo patchset |
539 |
-# |
540 |
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} |
541 |
-PATCH_DEV=${PATCH_DEV:-slyfox} |
542 |
- |
543 |
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} |
544 |
- https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" |
545 |
- |
546 |
-# |
547 |
-# The cross-compile logic |
548 |
-# |
549 |
-export CTARGET=${CTARGET:-${CHOST}} |
550 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
551 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
552 |
- export CTARGET=${CATEGORY#cross-} |
553 |
- fi |
554 |
-fi |
555 |
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } |
556 |
- |
557 |
-# |
558 |
-# The dependencies |
559 |
-# |
560 |
-RDEPEND=" |
561 |
- >=sys-devel/binutils-config-3 |
562 |
- sys-libs/zlib |
563 |
-" |
564 |
-DEPEND="${RDEPEND}" |
565 |
-BDEPEND=" |
566 |
- doc? ( sys-apps/texinfo ) |
567 |
- test? ( dev-util/dejagnu ) |
568 |
- nls? ( sys-devel/gettext ) |
569 |
- sys-devel/flex |
570 |
- virtual/yacc |
571 |
-" |
572 |
- |
573 |
-RESTRICT="!test? ( test )" |
574 |
- |
575 |
-MY_BUILDDIR=${WORKDIR}/build |
576 |
- |
577 |
-src_unpack() { |
578 |
- case ${PV} in |
579 |
- *9999) |
580 |
- git-r3_src_unpack |
581 |
- ;; |
582 |
- *) |
583 |
- ;; |
584 |
- esac |
585 |
- default |
586 |
- mkdir -p "${MY_BUILDDIR}" |
587 |
-} |
588 |
- |
589 |
-src_prepare() { |
590 |
- if [[ ! -z ${PATCH_VER} ]] ; then |
591 |
- einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" |
592 |
- eapply "${WORKDIR}/patch"/*.patch |
593 |
- fi |
594 |
- |
595 |
- # This check should probably go somewhere else, like pkg_pretend. |
596 |
- if [[ ${CTARGET} == *-uclibc* ]] ; then |
597 |
- if grep -qs 'linux-gnu' "${S}"/ltconfig ; then |
598 |
- die "sorry, but this binutils doesn't yet support uClibc :(" |
599 |
- fi |
600 |
- fi |
601 |
- |
602 |
- # Make sure our explicit libdir paths don't get clobbered. #562460 |
603 |
- sed -i \ |
604 |
- -e 's:@bfdlibdir@:@libdir@:g' \ |
605 |
- -e 's:@bfdincludedir@:@includedir@:g' \ |
606 |
- {bfd,opcodes}/Makefile.in || die |
607 |
- |
608 |
- # Fix locale issues if possible #122216 |
609 |
- if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then |
610 |
- einfo "Fixing misc issues in configure files" |
611 |
- for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do |
612 |
- ebegin " Updating ${f/${S}\/}" |
613 |
- patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ |
614 |
- || eerror "Please file a bug about this" |
615 |
- eend $? |
616 |
- done |
617 |
- fi |
618 |
- |
619 |
- # Fix conflicts with newer glibc #272594 |
620 |
- if [[ -e libiberty/testsuite/test-demangle.c ]] ; then |
621 |
- sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c |
622 |
- fi |
623 |
- |
624 |
- # Apply things from PATCHES and user dirs |
625 |
- default |
626 |
- |
627 |
- # Run misc portage update scripts |
628 |
- gnuconfig_update |
629 |
- elibtoolize --portage --no-uclibc |
630 |
-} |
631 |
- |
632 |
-toolchain-binutils_bugurl() { |
633 |
- printf "https://bugs.gentoo.org/" |
634 |
-} |
635 |
-toolchain-binutils_pkgversion() { |
636 |
- printf "Gentoo ${PV}" |
637 |
- [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" |
638 |
-} |
639 |
- |
640 |
-src_configure() { |
641 |
- # Setup some paths |
642 |
- LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} |
643 |
- INCPATH=${LIBPATH}/include |
644 |
- DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} |
645 |
- if is_cross ; then |
646 |
- TOOLPATH=/usr/${CHOST}/${CTARGET} |
647 |
- else |
648 |
- TOOLPATH=/usr/${CTARGET} |
649 |
- fi |
650 |
- BINPATH=${TOOLPATH}/binutils-bin/${PV} |
651 |
- |
652 |
- # Make sure we filter $LINGUAS so that only ones that |
653 |
- # actually work make it through #42033 |
654 |
- strip-linguas -u */po |
655 |
- |
656 |
- # Keep things sane |
657 |
- strip-flags |
658 |
- |
659 |
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
660 |
- |
661 |
- local x |
662 |
- echo |
663 |
- for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do |
664 |
- einfo "$(printf '%10s' ${x}:) ${!x}" |
665 |
- done |
666 |
- echo |
667 |
- |
668 |
- cd "${MY_BUILDDIR}" |
669 |
- local myconf=() |
670 |
- |
671 |
- if use plugins ; then |
672 |
- myconf+=( --enable-plugins ) |
673 |
- fi |
674 |
- # enable gold (installed as ld.gold) and ld's plugin architecture |
675 |
- if use gold ; then |
676 |
- myconf+=( --enable-gold ) |
677 |
- if use default-gold; then |
678 |
- myconf+=( --enable-gold=default ) |
679 |
- fi |
680 |
- fi |
681 |
- |
682 |
- if use nls ; then |
683 |
- myconf+=( --without-included-gettext ) |
684 |
- else |
685 |
- myconf+=( --disable-nls ) |
686 |
- fi |
687 |
- |
688 |
- myconf+=( --with-system-zlib ) |
689 |
- |
690 |
- # For bi-arch systems, enable a 64bit bfd. This matches |
691 |
- # the bi-arch logic in toolchain.eclass. #446946 |
692 |
- # We used to do it for everyone, but it's slow on 32bit arches. #438522 |
693 |
- case $(tc-arch) in |
694 |
- ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; |
695 |
- esac |
696 |
- |
697 |
- use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) |
698 |
- |
699 |
- [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) |
700 |
- |
701 |
- is_cross && myconf+=( |
702 |
- --with-sysroot="${EPREFIX}"/usr/${CTARGET} |
703 |
- --enable-poison-system-directories |
704 |
- ) |
705 |
- |
706 |
- # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ |
707 |
- # on everyone in alpha (for now), we'll just enable it when possible |
708 |
- has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) |
709 |
- has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) |
710 |
- |
711 |
- # mips can't do hash-style=gnu ... |
712 |
- if [[ $(tc-arch) != mips ]] ; then |
713 |
- myconf+=( --enable-default-hash-style=gnu ) |
714 |
- fi |
715 |
- |
716 |
- myconf+=( |
717 |
- --prefix="${EPREFIX}"/usr |
718 |
- --host=${CHOST} |
719 |
- --target=${CTARGET} |
720 |
- --datadir="${EPREFIX}"${DATAPATH} |
721 |
- --datarootdir="${EPREFIX}"${DATAPATH} |
722 |
- --infodir="${EPREFIX}"${DATAPATH}/info |
723 |
- --mandir="${EPREFIX}"${DATAPATH}/man |
724 |
- --bindir="${EPREFIX}"${BINPATH} |
725 |
- --libdir="${EPREFIX}"${LIBPATH} |
726 |
- --libexecdir="${EPREFIX}"${LIBPATH} |
727 |
- --includedir="${EPREFIX}"${INCPATH} |
728 |
- --enable-obsolete |
729 |
- --enable-shared |
730 |
- --enable-threads |
731 |
- # Newer versions (>=2.27) offer a configure flag now. |
732 |
- --enable-relro |
733 |
- # Newer versions (>=2.24) make this an explicit option. #497268 |
734 |
- --enable-install-libiberty |
735 |
- --disable-werror |
736 |
- --with-bugurl="$(toolchain-binutils_bugurl)" |
737 |
- --with-pkgversion="$(toolchain-binutils_pkgversion)" |
738 |
- $(use_enable static-libs static) |
739 |
- ${EXTRA_ECONF} |
740 |
- # Disable modules that are in a combined binutils/gdb tree. #490566 |
741 |
- --disable-{gdb,libdecnumber,readline,sim} |
742 |
- # Strip out broken static link flags. |
743 |
- # https://gcc.gnu.org/PR56750 |
744 |
- --without-stage1-ldflags |
745 |
- # Change SONAME to avoid conflict across |
746 |
- # {native,cross}/binutils, binutils-libs. #666100 |
747 |
- --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st) |
748 |
- ) |
749 |
- echo ./configure "${myconf[@]}" |
750 |
- "${S}"/configure "${myconf[@]}" || die |
751 |
- |
752 |
- # Prevent makeinfo from running if doc is unset. |
753 |
- if ! use doc ; then |
754 |
- sed -i \ |
755 |
- -e '/^MAKEINFO/s:=.*:= true:' \ |
756 |
- Makefile || die |
757 |
- fi |
758 |
-} |
759 |
- |
760 |
-src_compile() { |
761 |
- cd "${MY_BUILDDIR}" |
762 |
- # see Note [tooldir hack for ldscripts] |
763 |
- emake tooldir="${EPREFIX}${TOOLPATH}" all |
764 |
- |
765 |
- # only build info pages if the user wants them |
766 |
- if use doc ; then |
767 |
- emake info |
768 |
- fi |
769 |
- |
770 |
- # we nuke the manpages when we're left with junk |
771 |
- # (like when we bootstrap, no perl -> no manpages) |
772 |
- find . -name '*.1' -a -size 0 -delete |
773 |
-} |
774 |
- |
775 |
-src_test() { |
776 |
- cd "${MY_BUILDDIR}" |
777 |
- |
778 |
- # bug 637066 |
779 |
- filter-flags -Wall -Wreturn-type |
780 |
- |
781 |
- emake -k check |
782 |
-} |
783 |
- |
784 |
-src_install() { |
785 |
- local x d |
786 |
- |
787 |
- cd "${MY_BUILDDIR}" |
788 |
- # see Note [tooldir hack for ldscripts] |
789 |
- emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install |
790 |
- rm -rf "${ED}"/${LIBPATH}/bin |
791 |
- use static-libs || find "${ED}" -name '*.la' -delete |
792 |
- |
793 |
- # Newer versions of binutils get fancy with ${LIBPATH} #171905 |
794 |
- cd "${ED}"/${LIBPATH} |
795 |
- for d in ../* ; do |
796 |
- [[ ${d} == ../${PV} ]] && continue |
797 |
- mv ${d}/* . || die |
798 |
- rmdir ${d} || die |
799 |
- done |
800 |
- |
801 |
- # Now we collect everything intp the proper SLOT-ed dirs |
802 |
- # When something is built to cross-compile, it installs into |
803 |
- # /usr/$CHOST/ by default ... we have to 'fix' that :) |
804 |
- if is_cross ; then |
805 |
- cd "${ED}"/${BINPATH} |
806 |
- for x in * ; do |
807 |
- mv ${x} ${x/${CTARGET}-} |
808 |
- done |
809 |
- |
810 |
- if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then |
811 |
- mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} |
812 |
- mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ |
813 |
- rm -r "${ED}"/usr/${CHOST}/{include,lib} |
814 |
- fi |
815 |
- fi |
816 |
- insinto ${INCPATH} |
817 |
- local libiberty_headers=( |
818 |
- # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. |
819 |
- demangle.h |
820 |
- dyn-string.h |
821 |
- fibheap.h |
822 |
- hashtab.h |
823 |
- libiberty.h |
824 |
- objalloc.h |
825 |
- splay-tree.h |
826 |
- ) |
827 |
- doins "${libiberty_headers[@]/#/${S}/include/}" |
828 |
- if [[ -d ${ED}/${LIBPATH}/lib ]] ; then |
829 |
- mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ |
830 |
- rm -r "${ED}"/${LIBPATH}/lib |
831 |
- fi |
832 |
- |
833 |
- # Generate an env.d entry for this binutils |
834 |
- insinto /etc/env.d/binutils |
835 |
- cat <<-EOF > "${T}"/env.d |
836 |
- TARGET="${CTARGET}" |
837 |
- VER="${PV}" |
838 |
- LIBPATH="${EPREFIX}${LIBPATH}" |
839 |
- EOF |
840 |
- newins "${T}"/env.d ${CTARGET}-${PV} |
841 |
- |
842 |
- # Handle documentation |
843 |
- if ! is_cross ; then |
844 |
- cd "${S}" |
845 |
- dodoc README |
846 |
- docinto bfd |
847 |
- dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO |
848 |
- docinto binutils |
849 |
- dodoc binutils/ChangeLog binutils/NEWS binutils/README |
850 |
- docinto gas |
851 |
- dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* |
852 |
- docinto gprof |
853 |
- dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl |
854 |
- docinto ld |
855 |
- dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO |
856 |
- docinto libiberty |
857 |
- dodoc libiberty/ChangeLog* libiberty/README |
858 |
- docinto opcodes |
859 |
- dodoc opcodes/ChangeLog* |
860 |
- fi |
861 |
- |
862 |
- # Remove shared info pages |
863 |
- rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} |
864 |
- |
865 |
- # Trim all empty dirs |
866 |
- find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null |
867 |
-} |
868 |
- |
869 |
-pkg_postinst() { |
870 |
- # Make sure this ${CTARGET} has a binutils version selected |
871 |
- [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 |
872 |
- binutils-config ${CTARGET}-${PV} |
873 |
-} |
874 |
- |
875 |
-pkg_postrm() { |
876 |
- local current_profile=$(binutils-config -c ${CTARGET}) |
877 |
- |
878 |
- # If no other versions exist, then uninstall for this |
879 |
- # target ... otherwise, switch to the newest version |
880 |
- # Note: only do this if this version is unmerged. We |
881 |
- # rerun binutils-config if this is a remerge, as |
882 |
- # we want the mtimes on the symlinks updated (if |
883 |
- # it is the same as the current selected profile) |
884 |
- if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then |
885 |
- local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') |
886 |
- choice=${choice//$'\n'/ } |
887 |
- choice=${choice/* } |
888 |
- if [[ -z ${choice} ]] ; then |
889 |
- binutils-config -u ${CTARGET} |
890 |
- else |
891 |
- binutils-config ${choice} |
892 |
- fi |
893 |
- elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then |
894 |
- binutils-config ${CTARGET}-${PV} |
895 |
- fi |
896 |
-} |
897 |
- |
898 |
-# Note [slotting support] |
899 |
-# ----------------------- |
900 |
-# Gentoo's layout for binutils files is non-standard as Gentoo |
901 |
-# supports slotted installation for binutils. Many tools |
902 |
-# still expect binutils to reside in known locations. |
903 |
-# binutils-config package restores symlinks into known locations, |
904 |
-# like: |
905 |
-# /usr/bin/${CTARGET}-<tool> |
906 |
-# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips |
907 |
-# /usr/include/ |
908 |
-# |
909 |
-# Note [tooldir hack for ldscripts] |
910 |
-# --------------------------------- |
911 |
-# Build system does not allow ./configure to tweak every location |
912 |
-# we need for slotting binutils hence all the shuffling in |
913 |
-# src_install(). This note is about SCRIPTDIR define handling. |
914 |
-# |
915 |
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value |
916 |
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' |
917 |
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. |
918 |
-# Thus we can't just move files around after compilation finished. |
919 |
-# |
920 |
-# Our goal is the following: |
921 |
-# - at build-time set scriptdir to point to symlinked location: |
922 |
-# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) |
923 |
-# - at install-time set scriptdir to point to slotted location: |
924 |
-# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} |
925 |
|
926 |
diff --git a/sys-devel/binutils/files/binutils-2.33-gcc-10.patch b/sys-devel/binutils/files/binutils-2.33-gcc-10.patch |
927 |
deleted file mode 100644 |
928 |
index 9e1a999..0000000 |
929 |
--- a/sys-devel/binutils/files/binutils-2.33-gcc-10.patch |
930 |
+++ /dev/null |
931 |
@@ -1,39 +0,0 @@ |
932 |
-binutils: drop redundant 'program_name' definition |
933 |
- |
934 |
-https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=0b398d69acde3377dfbbeb8a4cfe87ae8c8562fa |
935 |
---- a/binutils/coffdump.c |
936 |
-+++ b/binutils/coffdump.c |
937 |
-@@ -456,8 +456,6 @@ coff_dump (struct coff_ofile *ptr) |
938 |
- dump_coff_section (ptr->sections + i); |
939 |
- } |
940 |
- |
941 |
--char * program_name; |
942 |
-- |
943 |
- static void |
944 |
- show_usage (FILE *file, int status) |
945 |
- { |
946 |
---- a/binutils/srconv.c |
947 |
-+++ b/binutils/srconv.c |
948 |
-@@ -1687,8 +1687,6 @@ prescan (struct coff_ofile *otree) |
949 |
- } |
950 |
- } |
951 |
- |
952 |
--char *program_name; |
953 |
-- |
954 |
- ATTRIBUTE_NORETURN static void |
955 |
- show_usage (FILE *ffile, int status) |
956 |
- { |
957 |
---- a/binutils/sysdump.c |
958 |
-+++ b/binutils/sysdump.c |
959 |
-@@ -633,8 +633,6 @@ module (void) |
960 |
- } |
961 |
- } |
962 |
- |
963 |
--char *program_name; |
964 |
-- |
965 |
- ATTRIBUTE_NORETURN static void |
966 |
- show_usage (FILE *ffile, int status) |
967 |
- { |
968 |
--- |
969 |
-2.25.0 |
970 |
- |
971 |
|
972 |
diff --git a/sys-devel/binutils/files/binutils-configure-LANG.patch b/sys-devel/binutils/files/binutils-configure-LANG.patch |
973 |
deleted file mode 100644 |
974 |
index 5521d19..0000000 |
975 |
--- a/sys-devel/binutils/files/binutils-configure-LANG.patch |
976 |
+++ /dev/null |
977 |
@@ -1,65 +0,0 @@ |
978 |
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in |
979 |
-option parsing, it may break. |
980 |
- |
981 |
-http://bugs.gentoo.org/103483 |
982 |
-http://bugs.gentoo.org/122216 |
983 |
- |
984 |
---- configure |
985 |
-+++ configure |
986 |
-@@ -54,6 +54,19 @@ |
987 |
- infodir='${prefix}/info' |
988 |
- mandir='${prefix}/man' |
989 |
- |
990 |
-+# NLS nuisances. |
991 |
-+for as_var in \ |
992 |
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |
993 |
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ |
994 |
-+ LC_TELEPHONE LC_TIME |
995 |
-+do |
996 |
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then |
997 |
-+ eval $as_var=C; export $as_var |
998 |
-+ else |
999 |
-+ unset $as_var |
1000 |
-+ fi |
1001 |
-+done |
1002 |
-+ |
1003 |
- # Initialize some other variables. |
1004 |
- subdirs= |
1005 |
- MFLAGS= MAKEFLAGS= |
1006 |
-@@ -452,16 +463,6 @@ |
1007 |
- esac |
1008 |
- done |
1009 |
- |
1010 |
--# NLS nuisances. |
1011 |
--# Only set these to C if already set. These must not be set unconditionally |
1012 |
--# because not all systems understand e.g. LANG=C (notably SCO). |
1013 |
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! |
1014 |
--# Non-C LC_CTYPE values break the ctype check. |
1015 |
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi |
1016 |
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi |
1017 |
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi |
1018 |
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi |
1019 |
-- |
1020 |
- # confdefs.h avoids OS command line length limits that DEFS can exceed. |
1021 |
- rm -rf conftest* confdefs.h |
1022 |
- # AIX cpp loses on an empty file, so make sure it contains at least a newline. |
1023 |
-@@ -1850,6 +1850,19 @@ |
1024 |
- # Compiler output produced by configure, useful for debugging |
1025 |
- # configure, is in ./config.log if it exists. |
1026 |
- |
1027 |
-+# NLS nuisances. |
1028 |
-+for as_var in \ |
1029 |
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |
1030 |
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ |
1031 |
-+ LC_TELEPHONE LC_TIME |
1032 |
-+do |
1033 |
-+ if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then |
1034 |
-+ eval \$as_var=C; export \$as_var |
1035 |
-+ else |
1036 |
-+ unset \$as_var |
1037 |
-+ fi |
1038 |
-+done |
1039 |
-+ |
1040 |
- ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" |
1041 |
- for ac_option |
1042 |
- do |
1043 |
|
1044 |
diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml |
1045 |
deleted file mode 100644 |
1046 |
index 66f4f23..0000000 |
1047 |
--- a/sys-devel/binutils/metadata.xml |
1048 |
+++ /dev/null |
1049 |
@@ -1,17 +0,0 @@ |
1050 |
-<?xml version="1.0" encoding="UTF-8"?> |
1051 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1052 |
-<pkgmetadata> |
1053 |
- <maintainer type="project"> |
1054 |
- <email>toolchain@g.o</email> |
1055 |
- <name>Gentoo Toolchain Project</name> |
1056 |
- </maintainer> |
1057 |
- <use> |
1058 |
- <flag name="default-gold">Set ld to point to ld.gold instead of ld.bfd</flag> |
1059 |
- <flag name="gold">Build ld.gold linker</flag> |
1060 |
- <flag name="plugins">Enable plugin support in tools</flag> |
1061 |
- <flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag> |
1062 |
- </use> |
1063 |
- <upstream> |
1064 |
- <remote-id type="cpe">cpe:/a:gnu:binutils</remote-id> |
1065 |
- </upstream> |
1066 |
-</pkgmetadata> |
1067 |
|
1068 |
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest |
1069 |
deleted file mode 100644 |
1070 |
index 716813f..0000000 |
1071 |
--- a/sys-devel/lld/Manifest |
1072 |
+++ /dev/null |
1073 |
@@ -1,3 +0,0 @@ |
1074 |
-DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 |
1075 |
-DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 |
1076 |
-DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 |
1077 |
|
1078 |
diff --git a/sys-devel/lld/lld-10.0.1-r1.ebuild b/sys-devel/lld/lld-10.0.1-r1.ebuild |
1079 |
deleted file mode 100644 |
1080 |
index 89535c3..0000000 |
1081 |
--- a/sys-devel/lld/lld-10.0.1-r1.ebuild |
1082 |
+++ /dev/null |
1083 |
@@ -1,52 +0,0 @@ |
1084 |
-# Copyright 1999-2021 Gentoo Authors |
1085 |
-# Distributed under the terms of the GNU General Public License v2 |
1086 |
- |
1087 |
-EAPI=7 |
1088 |
- |
1089 |
-PYTHON_COMPAT=( python3_{7..9} ) |
1090 |
-inherit cmake llvm llvm.org python-any-r1 |
1091 |
- |
1092 |
-DESCRIPTION="The LLVM linker (link editor)" |
1093 |
-HOMEPAGE="https://llvm.org/" |
1094 |
-LLVM_COMPONENTS=( lld ) |
1095 |
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) |
1096 |
-llvm.org_set_globals |
1097 |
- |
1098 |
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
1099 |
-SLOT="0" |
1100 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" |
1101 |
-IUSE="test" |
1102 |
-RESTRICT="!test? ( test )" |
1103 |
- |
1104 |
-RDEPEND="~sys-devel/llvm-${PV}" |
1105 |
-DEPEND="${RDEPEND}" |
1106 |
-BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" |
1107 |
- |
1108 |
-python_check_deps() { |
1109 |
- has_version -b "dev-python/lit[${PYTHON_USEDEP}]" |
1110 |
-} |
1111 |
- |
1112 |
-pkg_setup() { |
1113 |
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup |
1114 |
- use test && python-any-r1_pkg_setup |
1115 |
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
1116 |
-} |
1117 |
- |
1118 |
-src_configure() { |
1119 |
- local mycmakeargs=( |
1120 |
- -DBUILD_SHARED_LIBS=ON |
1121 |
- -DLLVM_INCLUDE_TESTS=$(usex test) |
1122 |
- ) |
1123 |
- use test && mycmakeargs+=( |
1124 |
- -DLLVM_BUILD_TESTS=ON |
1125 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
1126 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
1127 |
- -DLLVM_LIT_ARGS="$(get_lit_flags)" |
1128 |
- ) |
1129 |
- cmake_src_configure |
1130 |
-} |
1131 |
- |
1132 |
-src_test() { |
1133 |
- local -x LIT_PRESERVES_TMP=1 |
1134 |
- cmake_build check-lld |
1135 |
-} |
1136 |
|
1137 |
diff --git a/sys-devel/lld/lld-11.1.0-r1.ebuild b/sys-devel/lld/lld-11.1.0-r1.ebuild |
1138 |
deleted file mode 100644 |
1139 |
index b0133dc..0000000 |
1140 |
--- a/sys-devel/lld/lld-11.1.0-r1.ebuild |
1141 |
+++ /dev/null |
1142 |
@@ -1,58 +0,0 @@ |
1143 |
-# Copyright 1999-2021 Gentoo Authors |
1144 |
-# Distributed under the terms of the GNU General Public License v2 |
1145 |
- |
1146 |
-EAPI=7 |
1147 |
- |
1148 |
-PYTHON_COMPAT=( python3_{7..9} ) |
1149 |
-inherit cmake llvm llvm.org python-any-r1 |
1150 |
- |
1151 |
-DESCRIPTION="The LLVM linker (link editor)" |
1152 |
-HOMEPAGE="https://llvm.org/" |
1153 |
- |
1154 |
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
1155 |
-SLOT="0" |
1156 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
1157 |
-IUSE="test" |
1158 |
-RESTRICT="!test? ( test )" |
1159 |
- |
1160 |
-RDEPEND="~sys-devel/llvm-${PV}" |
1161 |
-DEPEND="${RDEPEND}" |
1162 |
-BDEPEND=" |
1163 |
- test? ( |
1164 |
- >=dev-util/cmake-3.16 |
1165 |
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") |
1166 |
- )" |
1167 |
- |
1168 |
-LLVM_COMPONENTS=( lld ) |
1169 |
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) |
1170 |
-llvm.org_set_globals |
1171 |
- |
1172 |
-python_check_deps() { |
1173 |
- has_version -b "dev-python/lit[${PYTHON_USEDEP}]" |
1174 |
-} |
1175 |
- |
1176 |
-pkg_setup() { |
1177 |
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup |
1178 |
- use test && python-any-r1_pkg_setup |
1179 |
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
1180 |
-} |
1181 |
- |
1182 |
-src_configure() { |
1183 |
- local mycmakeargs=( |
1184 |
- -DBUILD_SHARED_LIBS=ON |
1185 |
- -DLLVM_INCLUDE_TESTS=$(usex test) |
1186 |
- ) |
1187 |
- use test && mycmakeargs+=( |
1188 |
- -DLLVM_BUILD_TESTS=ON |
1189 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
1190 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
1191 |
- -DLLVM_LIT_ARGS="$(get_lit_flags)" |
1192 |
- -DPython3_EXECUTABLE="${PYTHON}" |
1193 |
- ) |
1194 |
- cmake_src_configure |
1195 |
-} |
1196 |
- |
1197 |
-src_test() { |
1198 |
- local -x LIT_PRESERVES_TMP=1 |
1199 |
- cmake_build check-lld |
1200 |
-} |
1201 |
|
1202 |
diff --git a/sys-devel/lld/lld-12.0.0.ebuild b/sys-devel/lld/lld-12.0.0.ebuild |
1203 |
deleted file mode 100644 |
1204 |
index c3f3d1a..0000000 |
1205 |
--- a/sys-devel/lld/lld-12.0.0.ebuild |
1206 |
+++ /dev/null |
1207 |
@@ -1,69 +0,0 @@ |
1208 |
-# Copyright 1999-2021 Gentoo Authors |
1209 |
-# Distributed under the terms of the GNU General Public License v2 |
1210 |
- |
1211 |
-EAPI=7 |
1212 |
- |
1213 |
-PYTHON_COMPAT=( python3_{7..9} ) |
1214 |
-inherit cmake llvm llvm.org python-any-r1 |
1215 |
- |
1216 |
-DESCRIPTION="The LLVM linker (link editor)" |
1217 |
-HOMEPAGE="https://llvm.org/" |
1218 |
- |
1219 |
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
1220 |
-SLOT="0" |
1221 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
1222 |
-IUSE="test" |
1223 |
-RESTRICT="!test? ( test )" |
1224 |
- |
1225 |
-RDEPEND="~sys-devel/llvm-${PV}" |
1226 |
-DEPEND="${RDEPEND}" |
1227 |
-BDEPEND=" |
1228 |
- test? ( |
1229 |
- >=dev-util/cmake-3.16 |
1230 |
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") |
1231 |
- )" |
1232 |
- |
1233 |
-LLVM_COMPONENTS=( lld libunwind/include/mach-o ) |
1234 |
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) |
1235 |
-llvm.org_set_globals |
1236 |
- |
1237 |
-python_check_deps() { |
1238 |
- has_version -b "dev-python/lit[${PYTHON_USEDEP}]" |
1239 |
-} |
1240 |
- |
1241 |
-pkg_setup() { |
1242 |
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup |
1243 |
- use test && python-any-r1_pkg_setup |
1244 |
- use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 |
1245 |
-} |
1246 |
- |
1247 |
-src_unpack() { |
1248 |
- llvm.org_src_unpack |
1249 |
- |
1250 |
- # Directory ${WORKDIR}/llvm does not exist with USE="-test", |
1251 |
- # but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below, |
1252 |
- # and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system |
1253 |
- # (lld/MachO/CMakeLists.txt) and is expected to be resolvable |
1254 |
- # to existent directory ${WORKDIR}/libunwind/include. |
1255 |
- mkdir -p "${WORKDIR}/llvm" || die |
1256 |
-} |
1257 |
- |
1258 |
-src_configure() { |
1259 |
- local mycmakeargs=( |
1260 |
- -DBUILD_SHARED_LIBS=ON |
1261 |
- -DLLVM_INCLUDE_TESTS=$(usex test) |
1262 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
1263 |
- ) |
1264 |
- use test && mycmakeargs+=( |
1265 |
- -DLLVM_BUILD_TESTS=ON |
1266 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
1267 |
- -DLLVM_LIT_ARGS="$(get_lit_flags)" |
1268 |
- -DPython3_EXECUTABLE="${PYTHON}" |
1269 |
- ) |
1270 |
- cmake_src_configure |
1271 |
-} |
1272 |
- |
1273 |
-src_test() { |
1274 |
- local -x LIT_PRESERVES_TMP=1 |
1275 |
- cmake_build check-lld |
1276 |
-} |
1277 |
|
1278 |
diff --git a/sys-devel/lld/metadata.xml b/sys-devel/lld/metadata.xml |
1279 |
deleted file mode 100644 |
1280 |
index 89c4bdb..0000000 |
1281 |
--- a/sys-devel/lld/metadata.xml |
1282 |
+++ /dev/null |
1283 |
@@ -1,7 +0,0 @@ |
1284 |
-<?xml version="1.0" encoding="UTF-8"?> |
1285 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1286 |
-<pkgmetadata> |
1287 |
- <maintainer type="project"> |
1288 |
- <email>llvm@g.o</email> |
1289 |
- </maintainer> |
1290 |
-</pkgmetadata> |