commit: e3db9ab7035d02c9e902615b8745b86cd2360638 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Apr 7 19:43:06 2018 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Apr 7 19:43:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e3db9ab7
sys-devel/binutils-config: stop breaking our gcc installs Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6 sys-devel/binutils-config/Manifest | 2 - .../binutils-config/binutils-config-5-r03.1.ebuild | 78 ---------------------- ...r03.2.ebuild => binutils-config-5-r03.5.ebuild} | 9 +-- sys-devel/binutils-config/files/binutils-config-5 | 7 +- 4 files changed, 10 insertions(+), 86 deletions(-) diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest index 290abb8cfc..a28d45bba6 100644 --- a/sys-devel/binutils-config/Manifest +++ b/sys-devel/binutils-config/Manifest @@ -1,3 +1 @@ -DIST binutils-config-ldwrapper-5.3.1.c 8342 BLAKE2B 18658a8188acfcd7494981bd60f53590f5610c7ffd9173f223da740c09acd9ed40aaf911faa6f9a517e5e8779cbaaea9d4398679b7a3037655a7994d9c319345 SHA512 af21c1b9bb465990e8490641023403ec27e31bd69f94fc86572392285a540ddc25d59fd8f682c0cb2d2a84c5e33fea08bd0ec2cb52861147075ccfd5e18067b0 -DIST binutils-config-ldwrapper-5.3.2.c 11791 BLAKE2B 7284c1f201b581b87a3dccfd9c572e0e03fa81af1c72fcd4edce15c53c04329316aa20a1135f7b728e35b3551ebb418eacc599da6a4803924dfddf7fbccaf1be SHA512 5e0917d50ba1cb0daee71bdd225809579bfc0a129c7bed234346f17a21aec6a0cddde35d5bc598924e840c45d6f9e738fd09f969904ca5df6041d38e5e0f0c2e DIST binutils-config-ldwrapper-5.3.4.c 13467 BLAKE2B 132c497c59c1315c4d9e85c842fa5636aac5d96aa2db69e1f677c31cd8a509653589c178058285c4e2e72d5095734f6849969f9ff99edfe1794c69733b60047c SHA512 cd4f33e37b2cd9e66d2e80aec28bec56e3d5383f15018b20c1afccd00e74d5f8ac2c6c2d8dde0de4be36aeec1237e2cc9b07326bceb24b2ca819e54c65ae6478 diff --git a/sys-devel/binutils-config/binutils-config-5-r03.1.ebuild b/sys-devel/binutils-config/binutils-config-5-r03.1.ebuild deleted file mode 100644 index c42663d6d1..0000000000 --- a/sys-devel/binutils-config/binutils-config-5-r03.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils prefix - -DESCRIPTION="Utility to change the binutils version being used" -HOMEPAGE="https://www.gentoo.org/"; -GIT_REV="d469b099b5e8aed45ff2edf78f91822b805440d3" -WRAPPER_REV="${PV}.3.1" -SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/sys-devel/binutils-config/files/ldwrapper.c?id=${GIT_REV} -> ${PN}-ldwrapper-${WRAPPER_REV}.c" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -# We also RDEPEND on sys-apps/findutils which is in base @system -RDEPEND="sys-apps/gentoo-functions - !<app-admin/eselect-1.4.5" - -S=${WORKDIR} - -# NOTE: the ld wrapper is only enabled on rpath versions of prefix. -src_prepare() { - cp "${FILESDIR}"/${PN}-${PV} ./${PN} || die - if use prefix-guest; then - epatch "${FILESDIR}/${PN}-5-ldwrapper.patch" - fi - eprefixify ${PN} -} - -src_configure() { - : -} - -src_compile() { - use prefix-guest || return - local args=( - $(tc-getCC) - ${CPPFLAGS} - ${CFLAGS} - -o ldwrapper "${DISTDIR}"/${PN}-ldwrapper-${WRAPPER_REV}.c - -DEPREFIX=\"${EPREFIX}\" - -DCHOST=\"${CHOST}\" - $([[ ${CHOST} == *-darwin* ]] && echo -DTARGET_DARWIN) - $([[ ${CHOST} == *-aix* ]] && echo -DTARGET_AIX) - ${LDFLAGS} - ) - echo ${args[*]} - "${args[@]}" || die -} - -src_install() { - dobin ${PN} - use prefix && eprefixify "${ED}"/usr/bin/${PN} - sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die - doman "${FILESDIR}"/${PN}.8 - - dodir /usr/$(get_libdir)/misc/binutils-config - mv "${S}"/ldwrapper "${ED}"/usr/$(get_libdir)/misc/binutils-config/ - - insinto /usr/share/eselect/modules - doins "${FILESDIR}"/binutils.eselect -} - -pkg_preinst() { - # Force a refresh when upgrading from an older version that symlinked - # in all the libs & includes that binutils-libs handles. #528088 - if has_version "<${CATEGORY}/${PN}-5" ; then - local bc current - bc="${ED}/usr/bin/binutils-config" - if current=$("${bc}" -c) ; then - "${bc}" "${current}" - fi - fi -} diff --git a/sys-devel/binutils-config/binutils-config-5-r03.2.ebuild b/sys-devel/binutils-config/binutils-config-5-r03.5.ebuild similarity index 93% rename from sys-devel/binutils-config/binutils-config-5-r03.2.ebuild rename to sys-devel/binutils-config/binutils-config-5-r03.5.ebuild index f6ea065833..a00860e6b2 100644 --- a/sys-devel/binutils-config/binutils-config-5-r03.2.ebuild +++ b/sys-devel/binutils-config/binutils-config-5-r03.5.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit eutils prefix DESCRIPTION="Utility to change the binutils version being used" HOMEPAGE="https://www.gentoo.org/"; -GIT_REV="e30f557eb73bff37366a44ebbbf4efdc0c616c58" -WRAPPER_REV="${PV}.3.2" +GIT_REV="edc0d44f70c27daebcc080ac5d08e8e191bccd95" +WRAPPER_REV="${PV}.3.4" SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/sys-devel/binutils-config/files/ldwrapper.c?id=${GIT_REV} -> ${PN}-ldwrapper-${WRAPPER_REV}.c" LICENSE="GPL-2" @@ -29,6 +29,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-5-ldwrapper.patch" fi eprefixify ${PN} + eapply_user } src_configure() { diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 index e6c5fac002..46eb2b21c4 100755 --- a/sys-devel/binutils-config/files/binutils-config-5 +++ b/sys-devel/binutils-config/files/binutils-config-5 @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Format of /etc/env.d/binutils/: @@ -159,7 +159,10 @@ switch_profile() { mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" - find -L "${dstlib}" -xtype l -name 'lib*' -exec rm -f {} + + # PREFIX LOCAL: we have gcc under dstlib here, and wiping symlinks + # is a very bad idea there, or our symlinked sonames disappear! + find -L "${dstlib}"/ldscripts -xtype l -name 'lib*' -exec rm -f {} + + # END PREFIX LOCAL # # Clean out old generated include symlinks
