Changeset ceebda5 for chapter05

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:

chapter05

Files:

• binutils-pass1.xml (modified) (1 diff)
• glibc.xml (modified) (2 diffs)
• libstdc++.xml (modified) (1 diff)

chapter05/binutils-pass1.xml

@@ -145 +145 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install -j1</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the make parameter:</title>
+
+      <varlistentry>
+        <term><parameter>-j1</parameter></term>
+        <listitem>
+          <para>An issue in the building system may cause the installation
+          to fail with <option>-j N</option> in <envar>MAKEFLAGS</envar>.
+          Override it to workaround this issue.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
   </sect2>

chapter05/glibc.xml

@@ -44 +44 @@
     <title>Installation of Glibc</title>
 
-    <para arch="default">First, create a symbolic link for LSB compliance. Additionally,
+    <para>First, create a symbolic link for LSB compliance. Additionally,
     for x86_64, create a compatibility symbolic link required for proper
     operation of the dynamic library loader:</para>
@@ -55 +55 @@
     ;;
 esac</userinput></screen>
-
-    <para arch="ml_32,ml_x32,ml_all">First, create symbolic links for LSB compliance
-    and compatibility symbolic links required for proper
-    operation of the dynamic library loader:</para>
-
 <!-- no ld-linux.so.2 here as multilib is based on x86_64, not on i686 -->
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
 ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3</userinput></screen>
+
+    <note>
+      <para>
+        The above command is correct.  The <command>ln</command> command has
+        a few syntactic versions, so be sure to check
+                <command>info coreutils ln</command> and <filename>ln(1)</filename>
+                before reporting what you may think is an error.
+          </para>
+    </note>
 
     <para>Some of the Glibc programs use the non-FHS compliant

chapter05/libstdc++.xml

@@ -76 +76 @@
         <term><parameter>--host=...</parameter></term>
         <listitem>
-          <para>Specifies the use the cross compiler we have just built
-          instead of the one in <filename>/usr/bin</filename>.</para>
+          <para>Specifies that the cross compiler we have just built
+          should be used instead of the one in
+          <filename>/usr/bin</filename>.</para>
         </listitem>
       </varlistentry>