From 1459439ddfb9b554d6df7364ace24441d83ee600 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 16 Feb 2020 02:41:17 +0000 Subject: [PATCH] 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 --- eclass/toolchain.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 54ad6df05d22..90f7b68312bb 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 -- 2.26.2