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