Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-config/
Date: Fri, 22 May 2020 20:36:06
Message-Id: 1590179756.97214ef7618a46554ee41c475c041536dda31aa2.slyfox@gentoo
1 commit: 97214ef7618a46554ee41c475c041536dda31aa2
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 22 20:35:47 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri May 22 20:35:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97214ef7
7
8 sys-devel/gcc-config: always regenerate ccache cache
9
10 USE flag change or code updates can change contents n /usr/bin.
11 The change adds ccache link regeneration.
12
13 Bug: https://bugs.gentoo.org/724454
14 Package-Manager: Portage-2.3.99, Repoman-2.3.22
15 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
16
17 sys-devel/gcc-config/gcc-config-9999.ebuild | 13 +++++++++----
18 1 file changed, 9 insertions(+), 4 deletions(-)
19
20 diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
21 index b599996f2b3..e4f08729165 100644
22 --- a/sys-devel/gcc-config/gcc-config-9999.ebuild
23 +++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
24 @@ -38,12 +38,14 @@ src_install() {
25 }
26
27 pkg_postinst() {
28 - # Scrub eselect-compiler remains
29 - rm -f "${ROOT}"/etc/env.d/05compiler &
30 + # Scrub eselect-compiler remains.
31 + # To be removed in 2021.
32 + rm -f "${ROOT}"/etc/env.d/05compiler
33
34 # We not longer use the /usr/include/g++-v3 hacks, as
35 # it is not needed ...
36 - rm -f "${ROOT}"/usr/include/g++{,-v3} &
37 + # To be removed in 2021.
38 + rm -f "${ROOT}"/usr/include/g++{,-v3}
39
40 # Do we have a valid multi ver setup ?
41 local x
42 @@ -51,5 +53,8 @@ pkg_postinst() {
43 gcc-config ${x}
44 done
45
46 - wait
47 + # USE flag change can add or delete files in /usr/bin worth recaching
48 + if [[ ! ${ROOT%/} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
49 + eselect compiler-shadow update all
50 + fi
51 }