Changeset d7e0db5 for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

ee1eb70

Parents:

4ea78e0

git-author:

Thomas Trepl <thomas@…> (08/23/2020 08:15:14 AM)

git-committer:

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

Message:

Merge changes from trunk to multilib

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

Location:

chapter06

Files:

• bash.xml (modified) (1 diff)
• findutils.xml (modified) (1 diff)
• gcc-pass2.xml (modified) (3 diffs)
• gzip.xml (modified) (1 diff)
• introduction.xml (modified) (1 diff)

chapter06/bash.xml

@@ -75 +75 @@
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
-    <para>Move the excutable to where it is expected:</para>
+    <para>Move the executable to where it is expected:</para>
 
 <screen><userinput remap="install">mv $LFS/usr/bin/bash $LFS/bin/bash</userinput></screen>

chapter06/findutils.xml

@@ -58 +58 @@
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
-    <para>Move the excutable to its final expected location:</para>
+    <para>Move the executable to its final expected location:</para>
 
 <screen><userinput remap="install">mv -v $LFS/usr/bin/find $LFS/bin

chapter06/gcc-pass2.xml

@@ -66 +66 @@
   ;;
 esac</userinput></screen>
-<!--
+
     <para arch="ml_32,ml_x32,ml_all">Change the default directory name for
     libraries:</para>
@@ -73 +73 @@
     -e '/m32=/s/m32=.*/m32=..\&lib-m32;$(call if_multiarch,:i386-linux-gnu)/' \
     -i.orig gcc/config/i386/t-linux64</userinput></screen>
-
+<!--
 <screen><userinput remap="pre">patch -Np1 -i ../&gcc-cross-patch;</userinput></screen>
 -->
@@ -153 +153 @@
           <para>This option is automatically enabled when building a native
           compiler with a native compiler on x86. But here, we build with
-          a cross compiler, so we need to explicitely set this option.</para>
+          a cross compiler, so we need to explicitly set this option.</para>
         </listitem>
       </varlistentry>

chapter06/gzip.xml

@@ -56 +56 @@
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
-    <para>Move the excutable to its final expected location:</para>
+    <para>Move the executable to its final expected location:</para>
 
 <screen><userinput remap="install">mv -v $LFS/usr/bin/gzip $LFS/bin</userinput></screen>

chapter06/introduction.xml

@@ -25 +25 @@
   together with building as root, may render your computer unusable.
   This whole chapter must be done as user <systemitem
-  class="username">lfs</systemitem>, with the enviroment as described in
+  class="username">lfs</systemitem>, with the environment as described in
   <xref linkend="ch-preps-settingenviron"/>.</para>