Changeset f5b747c for chapter08

Timestamp:

08/04/2021 12:09:24 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib, xry111/multilib

Children:

2dfe134

Parents:

31ff88b (diff), 4350669 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk

Location:

chapter08

Files:

• bash.xml (modified) (1 diff)
• glibc.xml (modified) (1 diff)
• strippingagain.xml (modified) (2 diffs)

chapter08/bash.xml

@@ -43 +43 @@
     <para>Prepare Bash for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                    \
+<screen><userinput remap="configure">./configure --prefix=/usr                      \
             --docdir=/usr/share/doc/bash-&bash-version; \
-            --without-bash-malloc            \
+            --without-bash-malloc              \
             --with-installed-readline</userinput></screen>
 

chapter08/glibc.xml

@@ -1097 +1097 @@
         <term><filename class="libraryfile">libutil</filename></term>
         <listitem>
-          <para>>Dummy library containing no functions. Previously contained
+          <para>Dummy library containing no functions. Previously contained
           code for <quote>standard</quote> functions used in
           many different Unix utilities. These functions are now in

chapter08/strippingagain.xml

@@ -41 +41 @@
   rationale to use the <command>install</command> command here.</para>
 
+  <note><para>The linux loader's name is ld-linux-x86-64.so.2 on 64-bit systems
+  and ld-linux.so.2 on 32-bit systems.  The contruct below selects the 
+  correct name for the current architecture.</para></note>
+
+
 <!-- 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_usrlib="ld-linux-x86-64.so.2
+      <screen><userinput>save_usrlib="$(cd /usr/lib; ls ld_linux*)
              libc.so.6
-             libpthread.so.6 
-             libthread_db.so
+             libthread_db.so.1
              libquadmath.so.&libquadmath-version; 
-             libstdc++.so.6
+             libstdc++.so.&libstdcpp-version;
              libitm.so.&libitm-version; 
              libatomic.so.&libatomic-version;" 
@@ -84 +88 @@
 
 online_usrbin="bash find strip"
-online_usrlib="libbfd.so 
-               libdl.so.2
-               libhistory.so
-               libncursesw.so
-               libm.so.6 
-               libreadline.so
-               libz.so
+online_usrlib="libbfd-&binutils-version;.so
+               libhistory.so.&readline-version;
+               libncursesw.so.&ncurses-version;
+               libm.so.6
+               libreadline.so.&readline-version;
+               libz.so.&zlib-version;
                $(cd /usr/lib; find libnss*.so* -type f)"