commit: bbc72dc75013128bb0a235010690db8b5cac7e30
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 22:17:03 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 23:37:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc72dc7
toolchain.eclass: update active cross-gcc on uninstall
gcc-config-2 changed /usr/bin/gcc from a binary to symlink
in commit b907ef80bc421df23515afc4c306e4d96c67649
("Convert binary wrapper to a symlink wrapper.")
Before the above change /usr/bin/gcc worked in both cases
when active cross-gcc is being uninstalled. After the above
change symlink becomes dangling.
The change runs `gcc-config` more aggressively.
Reported-by: Pietro
Closes: https://bugs.gentoo.org/680360
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
eclass/toolchain.eclass | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 9caed25f55a..6bc04b4cbfe 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2241,6 +2241,7 @@ toolchain_pkg_postinst() {
}
toolchain_pkg_postrm() {
+ do_gcc_config
if [[ ! ${ROOT%/} && -f
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
eselect compiler-shadow clean all
fi
@@ -2265,9 +2266,6 @@ toolchain_pkg_postrm() {
[[ ${ROOT%/} ]] && return 0
if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then
- # make sure the profile is sane during same-slot upgrade #289403
- do_gcc_config
-
einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'"
fix_libtool_files.sh ${GCC_RELEASE_VER}
if [[ -n ${BRANCH_UPDATE} ]] ; then
