Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gcc-config:master commit in: /
Date: Sat, 07 Sep 2019 22:08:10
Message-Id: 1567894025.1bcd38512f35ab0724279d7fc5bb8e5e1213a9d2.slyfox@gentoo
1 commit: 1bcd38512f35ab0724279d7fc5bb8e5e1213a9d2
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 7 22:07:05 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 7 22:07:05 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=1bcd3851
7
8 gcc-config: add einfo logging around library backup
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 gcc-config | 3 +++
13 1 file changed, 3 insertions(+)
14
15 diff --git a/gcc-config b/gcc-config
16 index 65b30bc..b1cda70 100755
17 --- a/gcc-config
18 +++ b/gcc-config
19 @@ -324,6 +324,7 @@ handle_split_usr() {
20 # Can be removed in 2021.
21 for lib in "${EROOT}"/lib*/libgcc_s{.so*,*dylib} "${EROOT}"/lib*/libunwind.so.7* ; do
22 # If we previously had stuff in /, make sure ldconfig gets re-run.
23 + einfo "Removing '${lib}'"
24 rm -f "${lib}"
25 old_libs=1
26 done
27 @@ -332,6 +333,7 @@ handle_split_usr() {
28 "${EROOT}"/lib*/"${GENTOO_GCC_BACKUP_DIR}"/libgcc_s.so.* \
29 "${EROOT}"/lib*/"${GENTOO_GCC_BACKUP_DIR}"/libunwind.so.* ; do
30 # If we previously had stuff in /, make sure ldconfig gets re-run.
31 + einfo "Removing '${lib}'"
32 rm -f "${lib}"
33 old_libs=1
34 done
35 @@ -350,6 +352,7 @@ handle_split_usr() {
36 # but for now, that should be safe ...
37 for gcclib in "${ROOT}${LDPATH}"/lib${gcclib}.so.* ; do
38 [[ -e ${gcclib} ]] || continue
39 + einfo "Backing up '${gcclib}' to '${libdir}"
40 cp -pP "${gcclib}" "${libdir}"/.gcc.config.new/
41 # no need to sanity `rm` this as the `mv` should take care
42 # of it. we also need this step to be completely atomic