Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-hppa64/
Date: Fri, 28 Dec 2018 23:13:42
Message-Id: 1546038661.797483954ed22351adca9ec38e3880dcfaddd238.dilfridge@gentoo
1 commit: 797483954ed22351adca9ec38e3880dcfaddd238
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 28 23:11:01 2018 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 28 23:11:01 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79748395
7
8 sys-devel/binutils-hppa64: Remove old
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 sys-devel/binutils-hppa64/Manifest | 1 -
14 .../binutils-hppa64/binutils-hppa64-2.30-r2.ebuild | 393 ---------------------
15 2 files changed, 394 deletions(-)
16
17 diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
18 index f61755ea716..8a0141a8f96 100644
19 --- a/sys-devel/binutils-hppa64/Manifest
20 +++ b/sys-devel/binutils-hppa64/Manifest
21 @@ -12,7 +12,6 @@ DIST binutils-2.29-patches-1.0.tar.xz 7548 BLAKE2B b5365ba6849f8809528ed13ce0b0e
22 DIST binutils-2.29.1-patches-2.tar.xz 18528 BLAKE2B 514496d6c9609362782d66b6cecbe3fe617f96dfb86e174a80d0b9113cbd4fce9d760fa61660ba2cfafbe1e482e955391cb8d3ef78d2c166c82796416a7ee106 SHA512 b60a3af9cd6a681f32a59fc4a30602ee1290f75cc93c8ad38ab0de17a7f30538a751b801dbaf079e3d514b9671e34e91742c4c9c953a8c9794505b571b7e80f0
23 DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7cabae424cff5e8495d1f064da24b6ef9e1c19d1d1adad2dca7142372782023f66b4b4223170a49b96ba3834266fe878 SHA512 4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592
24 DIST binutils-2.29.tar.bz2 29073316 BLAKE2B 0eb7bbefa1ac5f4d753ca9328d339a466d4f75c69d5d860802aded8e42ce4293f65c72a0f0596b170e90e1cc3ded23ea30576948cb875eea044cb02bb55bb2d3 SHA512 8148587d7e4f14ebcbcb3f984b116deaae5d4008228628acde14bc242a64a4b53faf1f6077a2c4ca4750e2f254b698ba506bd657f79e1202e87e7029b0069337
25 -DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f SHA512 1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581
26 DIST binutils-2.30-patches-5.tar.xz 590864 BLAKE2B 71de4d08f92ab1898ad576a21763f955067cbbed543250888e0c5d51f4ef77d0d829049e9a835691cf2de03965fbcc9bcfa092eb304c03f9b885e7a3dadab286 SHA512 029b3be6ae9b8620f8580a35701bd4517b4e0232ff3cf9983b3808475c7443cbf500b6cace2c052df0bd1e47202838f4d2453238db28709a947117071d9ae804
27 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
28 DIST binutils-2.31.1-patches-4.tar.xz 63460 BLAKE2B 6507d03a3b75fe4b65b3c58377baaf377e07aa3e5dee4f6f4cd25336f53a15b4249e72a107213062611c8674be2bcd478a8f1406940385e0b0e58ad5a7c61cc0 SHA512 aa9f2a5b9c2189c528f34c55cd2609eae5fb47e46b51a8f9aa595b0a1e2c3f103880dcc8f07e48b10971d669e4c2a7ce8a41be4763a1ebf9e956e3f1eade8f22
29
30 diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r2.ebuild
31 deleted file mode 100644
32 index 7f131bab5ea..00000000000
33 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r2.ebuild
34 +++ /dev/null
35 @@ -1,393 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -export CTARGET=hppa64-${CHOST#*-}
42 -
43 -inherit eutils libtool flag-o-matic gnuconfig multilib versionator
44 -
45 -DESCRIPTION="Tools necessary to build programs"
46 -HOMEPAGE="https://sourceware.org/binutils/"
47 -LICENSE="GPL-3+"
48 -IUSE="+cxx doc multitarget +nls static-libs test"
49 -
50 -# Variables that can be set here:
51 -# PATCH_VER - the patchset version
52 -# Default: empty, no patching
53 -# PATCH_BINUTILS_VER - the binutils version in the patchset name
54 -# - Default: PV
55 -# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
56 -# for the patchsets
57 -# Default: dilfridge :)
58 -
59 -PATCH_VER=2
60 -
61 -case ${PV} in
62 - 9999)
63 - BVER="git"
64 - EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
65 - inherit git-r3
66 - S=${WORKDIR}/binutils
67 - EGIT_CHECKOUT_DIR=${S}
68 - ;;
69 - *)
70 - BVER=${PV}
71 - SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${BVER}.tar.xz"
72 - ;;
73 -esac
74 -SLOT="${BVER}"
75 -KEYWORDS="-* hppa"
76 -
77 -#
78 -# The Gentoo patchset
79 -#
80 -PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
81 -PATCH_DEV=${PATCH_DEV:-dilfridge}
82 -
83 -[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
84 - https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
85 -
86 -#
87 -# The cross-compile logic
88 -#
89 -export CTARGET=${CTARGET:-${CHOST}}
90 -if [[ ${CTARGET} == ${CHOST} ]] ; then
91 - if [[ ${CATEGORY} == cross-* ]] ; then
92 - export CTARGET=${CATEGORY#cross-}
93 - fi
94 -fi
95 -is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
96 -
97 -#
98 -# The dependencies
99 -#
100 -RDEPEND="
101 - >=sys-devel/binutils-config-3
102 - sys-libs/zlib
103 -"
104 -DEPEND="${RDEPEND}
105 - doc? ( sys-apps/texinfo )
106 - test? ( dev-util/dejagnu )
107 - nls? ( sys-devel/gettext )
108 - sys-devel/flex
109 - virtual/yacc
110 -"
111 -if is_cross ; then
112 - # The build assumes the host has libiberty and such when cross-compiling
113 - # its build tools. We should probably make binutils itself build a local
114 - # copy to use, but until then, be lazy.
115 - DEPEND+=" >=sys-libs/binutils-libs-${PV}"
116 -fi
117 -
118 -MY_BUILDDIR=${WORKDIR}/build
119 -S=${WORKDIR}/${P/-hppa64/}
120 -
121 -src_unpack() {
122 - case ${PV} in
123 - 9999)
124 - git-r3_src_unpack;
125 - ;;
126 - *)
127 - default
128 - ;;
129 - esac
130 - mkdir -p "${MY_BUILDDIR}"
131 -}
132 -
133 -src_prepare() {
134 - if [[ ! -z ${PATCH_VER} ]] ; then
135 - einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
136 - eapply "${WORKDIR}/patch"/*.patch
137 - fi
138 -
139 - # This check should probably go somewhere else, like pkg_pretend.
140 - if [[ ${CTARGET} == *-uclibc* ]] ; then
141 - if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
142 - die "sorry, but this binutils doesn't yet support uClibc :("
143 - fi
144 - fi
145 -
146 - # Make sure our explicit libdir paths don't get clobbered. #562460
147 - sed -i \
148 - -e 's:@bfdlibdir@:@libdir@:g' \
149 - -e 's:@bfdincludedir@:@includedir@:g' \
150 - {bfd,opcodes}/Makefile.in || die
151 -
152 - # Fix locale issues if possible #122216
153 - if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
154 - einfo "Fixing misc issues in configure files"
155 - for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
156 - ebegin " Updating ${f/${S}\/}"
157 - patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
158 - || eerror "Please file a bug about this"
159 - eend $?
160 - done
161 - fi
162 -
163 - # Fix conflicts with newer glibc #272594
164 - if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
165 - sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
166 - fi
167 -
168 - # Apply things from PATCHES and user dirs
169 - default
170 -
171 - # Run misc portage update scripts
172 - gnuconfig_update
173 - elibtoolize --portage --no-uclibc
174 -}
175 -
176 -toolchain-binutils_bugurl() {
177 - printf "https://bugs.gentoo.org/"
178 -}
179 -toolchain-binutils_pkgversion() {
180 - printf "Gentoo ${BVER}"
181 - [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
182 -}
183 -
184 -src_configure() {
185 - # Setup some paths
186 - LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
187 - INCPATH=${LIBPATH}/include
188 - DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
189 - if is_cross ; then
190 - BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
191 - else
192 - BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
193 - fi
194 -
195 - # Make sure we filter $LINGUAS so that only ones that
196 - # actually work make it through #42033
197 - strip-linguas -u */po
198 -
199 - # Keep things sane
200 - strip-flags
201 -
202 - local x
203 - echo
204 - for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
205 - einfo "$(printf '%10s' ${x}:) ${!x}"
206 - done
207 - echo
208 -
209 - cd "${MY_BUILDDIR}"
210 - local myconf=()
211 -
212 - # enable gold (installed as ld.gold) and ld's plugin architecture
213 - if use cxx ; then
214 - myconf+=( --enable-gold )
215 - myconf+=( --enable-plugins )
216 - fi
217 -
218 - if use nls ; then
219 - myconf+=( --without-included-gettext )
220 - else
221 - myconf+=( --disable-nls )
222 - fi
223 -
224 - myconf+=( --with-system-zlib )
225 -
226 - # For bi-arch systems, enable a 64bit bfd. This matches
227 - # the bi-arch logic in toolchain.eclass. #446946
228 - # We used to do it for everyone, but it's slow on 32bit arches. #438522
229 - case $(tc-arch) in
230 - ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
231 - esac
232 -
233 - use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
234 -
235 - [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
236 -
237 - is_cross && myconf+=(
238 - --with-sysroot="${EPREFIX}"/usr/${CTARGET}
239 - --enable-poison-system-directories
240 - )
241 -
242 - # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
243 - # on everyone in alpha (for now), we'll just enable it when possible
244 - has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
245 - has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
246 -
247 - # mips can't do hash-style=gnu ...
248 - if [[ $(tc-arch) != mips ]] ; then
249 - myconf+=( --enable-default-hash-style=gnu )
250 - fi
251 -
252 - myconf+=(
253 - --prefix="${EPREFIX}"/usr
254 - --host=${CHOST}
255 - --target=${CTARGET}
256 - --datadir="${EPREFIX}"${DATAPATH}
257 - --datarootdir="${EPREFIX}"${DATAPATH}
258 - --infodir="${EPREFIX}"${DATAPATH}/info
259 - --mandir="${EPREFIX}"${DATAPATH}/man
260 - --bindir="${EPREFIX}"${BINPATH}
261 - --libdir="${EPREFIX}"${LIBPATH}
262 - --libexecdir="${EPREFIX}"${LIBPATH}
263 - --includedir="${EPREFIX}"${INCPATH}
264 - --enable-obsolete
265 - --enable-shared
266 - --enable-threads
267 - # Newer versions (>=2.27) offer a configure flag now.
268 - --enable-relro
269 - # Newer versions (>=2.24) make this an explicit option. #497268
270 - --enable-install-libiberty
271 - --disable-werror
272 - --with-bugurl="$(toolchain-binutils_bugurl)"
273 - --with-pkgversion="$(toolchain-binutils_pkgversion)"
274 - $(use_enable static-libs static)
275 - ${EXTRA_ECONF}
276 - # Disable modules that are in a combined binutils/gdb tree. #490566
277 - --disable-{gdb,libdecnumber,readline,sim}
278 - # Strip out broken static link flags.
279 - # https://gcc.gnu.org/PR56750
280 - --without-stage1-ldflags
281 - )
282 - echo ./configure "${myconf[@]}"
283 - "${S}"/configure "${myconf[@]}" || die
284 -
285 - # Prevent makeinfo from running if doc is unset.
286 - if ! use doc ; then
287 - sed -i \
288 - -e '/^MAKEINFO/s:=.*:= true:' \
289 - Makefile || die
290 - fi
291 -}
292 -
293 -src_compile() {
294 - cd "${MY_BUILDDIR}"
295 - emake all
296 -
297 - # only build info pages if the user wants them
298 - if use doc ; then
299 - emake info
300 - fi
301 -
302 - # we nuke the manpages when we're left with junk
303 - # (like when we bootstrap, no perl -> no manpages)
304 - find . -name '*.1' -a -size 0 -delete
305 -}
306 -
307 -src_test() {
308 - cd "${MY_BUILDDIR}"
309 - emake -k check
310 -}
311 -
312 -src_install() {
313 - local x d
314 -
315 - cd "${MY_BUILDDIR}"
316 - emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
317 - rm -rf "${ED}"/${LIBPATH}/bin
318 - use static-libs || find "${ED}" -name '*.la' -delete
319 -
320 - # Newer versions of binutils get fancy with ${LIBPATH} #171905
321 - cd "${ED}"/${LIBPATH}
322 - for d in ../* ; do
323 - [[ ${d} == ../${BVER} ]] && continue
324 - mv ${d}/* . || die
325 - rmdir ${d} || die
326 - done
327 -
328 - # Now we collect everything intp the proper SLOT-ed dirs
329 - # When something is built to cross-compile, it installs into
330 - # /usr/$CHOST/ by default ... we have to 'fix' that :)
331 - if is_cross ; then
332 - cd "${ED}"/${BINPATH}
333 - for x in * ; do
334 - mv ${x} ${x/${CTARGET}-}
335 - done
336 -
337 - if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
338 - mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
339 - mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
340 - rm -r "${ED}"/usr/${CHOST}/{include,lib}
341 - fi
342 - fi
343 - insinto ${INCPATH}
344 - local libiberty_headers=(
345 - # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir.
346 - demangle.h
347 - dyn-string.h
348 - fibheap.h
349 - hashtab.h
350 - libiberty.h
351 - objalloc.h
352 - splay-tree.h
353 - )
354 - doins "${libiberty_headers[@]/#/${S}/include/}" || die
355 - if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
356 - mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
357 - rm -r "${ED}"/${LIBPATH}/lib
358 - fi
359 -
360 - # Generate an env.d entry for this binutils
361 - insinto /etc/env.d/binutils
362 - cat <<-EOF > "${T}"/env.d
363 - TARGET="${CTARGET}"
364 - VER="${BVER}"
365 - LIBPATH="${EPREFIX}${LIBPATH}"
366 - EOF
367 - newins "${T}"/env.d ${CTARGET}-${BVER}
368 -
369 - # Handle documentation
370 - if ! is_cross ; then
371 - cd "${S}"
372 - dodoc README
373 - docinto bfd
374 - dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
375 - docinto binutils
376 - dodoc binutils/ChangeLog binutils/NEWS binutils/README
377 - docinto gas
378 - dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
379 - docinto gprof
380 - dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
381 - docinto ld
382 - dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
383 - docinto libiberty
384 - dodoc libiberty/ChangeLog* libiberty/README
385 - docinto opcodes
386 - dodoc opcodes/ChangeLog*
387 - fi
388 -
389 - # Remove shared info pages
390 - rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
391 -
392 - # Trim all empty dirs
393 - find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
394 -
395 - # the hppa64 hack; this should go into 9999 as a PN-conditional
396 - # tweak the default fake list a little bit
397 - cd "${D}"/etc/env.d/binutils
398 - sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${BVER} || die
399 -}
400 -
401 -pkg_postinst() {
402 - # Make sure this ${CTARGET} has a binutils version selected
403 - [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
404 - binutils-config ${CTARGET}-${BVER}
405 -}
406 -
407 -pkg_postrm() {
408 - local current_profile=$(binutils-config -c ${CTARGET})
409 -
410 - # If no other versions exist, then uninstall for this
411 - # target ... otherwise, switch to the newest version
412 - # Note: only do this if this version is unmerged. We
413 - # rerun binutils-config if this is a remerge, as
414 - # we want the mtimes on the symlinks updated (if
415 - # it is the same as the current selected profile)
416 - if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
417 - local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
418 - choice=${choice//$'\n'/ }
419 - choice=${choice/* }
420 - if [[ -z ${choice} ]] ; then
421 - binutils-config -u ${CTARGET}
422 - else
423 - binutils-config ${choice}
424 - fi
425 - elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
426 - binutils-config ${CTARGET}-${BVER}
427 - fi
428 -}