[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sergei Trofimovich]

commit:     1459439ddfb9b554d6df7364ace24441d83ee600
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 02:41:17 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 04:02:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1459439d

toolchain.eclass: don't strip EPREFIX in dosym

This reverts 'dosym' part of
    "toolchain.eclass: Prepend/strip EPREFIX"
patch. portage-2.3.85 and above contains
    "dosym: revert deprecated prefix compat (bug 615594)"
patch. That effectively breaks gcc's /usr/bin/ symlinks.

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 eclass/toolchain.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 54ad6df05d2..90f7b68312b 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1811,11 +1811,11 @@ toolchain_src_install() {
                if [[ -f ${CTARGET}-${x} ]] ; then
                        if ! is_crosscompile ; then
                                ln -sf ${CTARGET}-${x} ${x}
-                               dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+                               dosym ${BINPATH}/${CTARGET}-${x} \
                                        /usr/bin/${x}-${GCC_CONFIG_VER}
                        fi
                        # Create versioned symlinks
-                       dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+                       dosym ${BINPATH}/${CTARGET}-${x} \
                                /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
                fi