From d7a942197e713339d4dc1eedab4dafd4179a5cd8 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Tue, 11 May 2021 23:24:11 -0500
Subject: Merge Xi's changes into trunk Update to meson-0.58.0 Update to
 systemd-248 Update to gcc-11.1.0 Update to linux-5.12.1 Update to
 iproute2-5.12.0 Update to Python-3.9.5 Make /bin, /sbin, and /lib symlinks to
 their counterparts in /usr. Thanks again for a significant portion of this
 work goes to Xi, I only really merged it and made a couple of modifications
 for my updates. To LFS 11.x we go!

---
 chapter08/strippingagain.xml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'chapter08/strippingagain.xml')

diff --git a/chapter08/strippingagain.xml b/chapter08/strippingagain.xml
index 891d2e000..8f5743b51 100644
--- a/chapter08/strippingagain.xml
+++ b/chapter08/strippingagain.xml
@@ -33,17 +33,8 @@
 <!-- also of interest are libgfortan, libgo, libgomp, and libobjc from GCC -->
 
 <!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
-<screen><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so"
-
-cd /lib
-
-for LIB in $save_lib; do
-    objcopy --only-keep-debug $LIB $LIB.dbg 
-    strip --strip-unneeded $LIB
-    objcopy --add-gnu-debuglink=$LIB.dbg $LIB 
-done    
-
-save_usrlib="libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
+<screen><userinput>save_usrlib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so
+             libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
              libitm.so.&libitm-version; libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
 
 cd /usr/lib
@@ -54,7 +45,7 @@ for LIB in $save_usrlib; do
     objcopy --add-gnu-debuglink=$LIB.dbg $LIB
 done
 
-unset LIB save_lib save_usrlib</userinput></screen>
+unset LIB save_usrlib</userinput></screen>
 
 <!--  <para>Before performing the stripping, take special care to ensure that
   none of the binaries that are about to be stripped are running:</para>
@@ -67,10 +58,10 @@ unset LIB save_lib save_usrlib</userinput></screen>
 <screen><userinput>find /usr/lib -type f -name \*.a \
    -exec strip --strip-debug {} ';'
 
-find /lib /usr/lib -type f -name \*.so* ! -name \*dbg \
+find /usr/lib -type f -name \*.so* ! -name \*dbg \
    -exec strip --strip-unneeded {} ';'
 
-find /{bin,sbin} /usr/{bin,sbin,libexec} -type f \
+find /usr/{bin,sbin,libexec} -type f \
     -exec strip --strip-all {} ';'</userinput></screen>
 
   <para>A large number of files will be reported as having their file
-- 
cgit v1.2.3-54-g00ecf