Changeset ceebda5 for chapter06

Timestamp:

03/31/2021 10:41:41 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

61385ca

Parents:

eef83ea

git-author:

Thomas Trepl <thomas@…> (03/30/2021 08:47:28 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:41 AM)

Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12176 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• binutils-pass2.xml (modified) (1 diff)
• file.xml (modified) (1 diff)

chapter06/binutils-pass2.xml

@@ -107 +107 @@
     to link against zlib from the host distribution:</para>
 
-<screen><userinput remap="install">make DESTDIR=$LFS install
+<screen><userinput remap="install">make DESTDIR=$LFS install -j1
 install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
-
-    <para>
-      Workaround an issue causing
-      <filename class="libraryfile">libctf.so</filename>
-      to link against zlib from the host distribution:
-    </para>
-
-<screen><userinput remap="install">install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
 
   </sect2>

chapter06/file.xml

@@ -91 +91 @@
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
+    <para>Move a shared library into its final location in the LFS system,
+    and recreate the symlink for it:</para>
+
+<screen><userinput remap="install">mv -v $LFS/usr/lib/libmagic.so.* $LFS/lib
+ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) $LFS/usr/lib/libmagic.so</userinput></screen>
+
   </sect2>