Revert "sys-devel/binutils-config: add avr/msp symlink handling"

This reverts commit 1b129b82462191f6adf022a2327d5b3a72dcb893.

This change caused symlinks to go missing under /usr/${CTARGET}/lib for
"normal" cross toolchains. Anothoer solution is needed for avr/msp.

Closes: https://bugs.gentoo.org/642738

diff --git a/sys-devel/binutils-config/binutils-config-5-r3.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
similarity index 100%
rename from sys-devel/binutils-config/binutils-config-5-r3.ebuild
rename to sys-devel/binutils-config/binutils-config-5-r4.ebuild

diff --git a/sys-devel/binutils-config/binutils-config-5.1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
similarity index 100%
rename from sys-devel/binutils-config/binutils-config-5.1.ebuild
rename to sys-devel/binutils-config/binutils-config-5.1-r1.ebuild

diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5
index e6c5fac0026433c9ee2205b80a81314ce23376c8..acb72b7e343589f147a1d3585cd6963a232bd0c0 100755 (executable)
--- 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-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Format of /etc/env.d/binutils/:
@@ -145,17 +145,13 @@ switch_profile() {
        cd "${ROOT}/${LIBPATH}" || exit 1
        if [[ ${TARGET} == ${HOST} ]] ; then
                dstlib=${EROOT}/usr/${HOST}/lib
-       elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then
-               # true for at least avr and msp targets
-               dstlib=${EROOT}/usr/${TARGET}/lib
        else
                dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
        fi
        # When upgrading, we need to clean up ldscripts and libs.
        # Don't symlink back in the libs -- the binutils-lib package handles
        # these now.
-       # TODO: Stop requiring even the ldscripts symlink, except
-       # we can't for bare-metal toolchains, so...  bug #147155
+       # TODO: Stop requiring even the ldscripts symlink.
        mkdir -p "${dstlib}"
        rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
        atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"

diff --git a/sys-devel/binutils-config/files/binutils-config-5.1 b/sys-devel/binutils-config/files/binutils-config-5.1
index 945295c3e3ad5258983164592b0ea260a30bb96d..ec06d47c14a7114ebf54ef417b0e9f50930aa015 100644 (file)
--- a/sys-devel/binutils-config/files/binutils-config-5.1
+++ b/sys-devel/binutils-config/files/binutils-config-5.1
@@ -145,17 +145,13 @@ switch_profile() {
        cd "${ROOT}/${LIBPATH}" || exit 1
        if [[ ${TARGET} == ${HOST} ]] ; then
                dstlib=${EROOT}/usr/${HOST}/lib
-       elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then
-               # true for at least avr and msp targets
-               dstlib=${EROOT}/usr/${TARGET}/lib
        else
                dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
        fi
        # When upgrading, we need to clean up ldscripts and libs.
        # Don't symlink back in the libs -- the binutils-lib package handles
        # these now.
-       # TODO: Stop requiring even the ldscripts symlink, except
-       # we can't for bare-metal toolchains, so...  bug #147155
+       # TODO: Stop requiring even the ldscripts symlink.
        mkdir -p "${dstlib}"
        rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
        atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"