From ff96923bf37ce4beed6b4d0146c454c7df6da95f Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 25 Jul 2021 20:10:18 -0500
Subject: Package updates and stripping fixes Add workaround to strip libraries
 correctly. Update to shadow-4.9. Update to util-linux 2.37.1.

---
 chapter08/strippingagain.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'chapter08/strippingagain.xml')

diff --git a/chapter08/strippingagain.xml b/chapter08/strippingagain.xml
index 8f5743b51..d2e686e8f 100644
--- a/chapter08/strippingagain.xml
+++ b/chapter08/strippingagain.xml
@@ -34,15 +34,18 @@
 
 <!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
 <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;
+             libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version; libz.so.&zlib-version;
              libitm.so.&libitm-version; libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
 
 cd /usr/lib
 
 for LIB in $save_usrlib; do
     objcopy --only-keep-debug $LIB $LIB.dbg
-    strip --strip-unneeded $LIB
-    objcopy --add-gnu-debuglink=$LIB.dbg $LIB
+    cp $LIB /tmp/$LIB
+    strip --strip-unneeded /tmp/$LIB
+    objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
+    install -vm755 /tmp/$LIB /usr/lib
+    rm /tmp/$LIB
 done
 
 unset LIB save_usrlib</userinput></screen>
@@ -58,7 +61,7 @@ unset LIB save_usrlib</userinput></screen>
 <screen><userinput>find /usr/lib -type f -name \*.a \
    -exec strip --strip-debug {} ';'
 
-find /usr/lib -type f -name \*.so* ! -name \*dbg \
+find /usr/lib -type f -name \*.so* ! -name \*dbg ! -name libz.so* \
    -exec strip --strip-unneeded {} ';'
 
 find /usr/{bin,sbin,libexec} -type f \
-- 
cgit v1.2.3-54-g00ecf