Changeset f8ffc3a5 for chapter06

Timestamp:

11/11/2022 04:19:44 PM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64, xry111/arm64-12.0

Children:

1ace465

Parents:

1a77314f (diff), c4fc75e (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 remote-tracking branch 'origin/trunk' into xry111/arm64

Location:

chapter06

Files:

• binutils-pass2.xml (modified) (2 diffs)
• file.xml (modified) (1 diff)
• gcc-pass2.xml (modified) (4 diffs)
• introduction.xml (modified) (1 diff)
• make.xml (modified) (1 diff)
• ncurses.xml (modified) (3 diffs)

chapter06/binutils-pass2.xml

@@ -46 +46 @@
     <!-- Don't remove this until Binutils upstream updates the libtool
          copy.  On some host distros the issue doesn't show up.  -->
-    <para>Binutils ships an outdated libtool copy in the tarball.  It lacks
-    sysroot support so the produced binaries will be mistakenly linked to
-    libraries from the host distro.  Workaround this issue:</para>
+    <para>Binutils ships an outdated copy of libtool in the tarball.  It lacks
+    sysroot support, so the produced binaries will be mistakenly linked to
+    libraries from the host distro.  Work around this issue:</para>
 
 <screen><userinput remap="pre">sed '6009s/$add_dir//' -i ltmain.sh</userinput></screen>
@@ -84 +84 @@
         <term><parameter>--enable-64-bit-bfd</parameter></term>
         <listitem>
-          <para>Enables 64-bit support (on hosts with narrower word sizes).
-          May not be needed on 64-bit systems, but does no harm.</para>
+          <para>Enables 64-bit support (on hosts with smaller word sizes).
+          This may not be needed on 64-bit systems, but it does no harm.</para>
         </listitem>
       </varlistentry>

chapter06/file.xml

@@ -46 +46 @@
     <para>
        The <command>file</command> command on the build host needs
-       to be same version as the one we are building in order to
-       create the signature file. Run the following commands to build it:
+       to be the same version as the one we are building in order to
+       create the signature file. Run the following commands to make a
+       temporary copy of the <command>file</command> command:
     </para>
 

chapter06/gcc-pass2.xml

@@ -49 +49 @@
 -->
     <para>As in the first build of GCC, the GMP, MPFR, and MPC packages are
-    required. Unpack the tarballs and move them into the required directory
-    names:</para>
+    required. Unpack the tarballs and move them into the required directories:</para>
 
 <screen><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
@@ -109 +108 @@
           a cross-compiler is used for building GCC, and that compiler knows
           that it has to look for headers and libraries in <filename
-          class="directory">$LFS</filename>. But the build system of GCC uses
+          class="directory">$LFS</filename>. But the build system for GCC uses
           other tools, which are not aware of this location. This switch is
-          needed to have them find the needed files in <filename
+          needed so those tools will find the needed files in <filename
           class="directory">$LFS</filename>, and not on the host.</para>
         </listitem>
@@ -119 +118 @@
         <term><parameter>--target=$LFS_TGT</parameter></term>
         <listitem>
-          <para>As we are cross-compiling GCC, it's impossible to build
+          <para>We are cross-compiling GCC, so it's impossible to build
           target libraries (<filename class="libraryfile">libgcc</filename>
           and <filename class="libraryfile">libstdc++</filename>) with the
-          compiled GCC binaries because these binaries won't run on the
-          host distro.  GCC building system will attempt to use the
-          C and C++ compilers on the host distro as a workaround by default.
-          It's not supported to build GCC target libraries with a different
-          version of GCC, so using host compilers may cause building
-          failure.  This parameter ensures to build the libraries with GCC
-          pass 1 and prevent the issue.</para>
+          previously compiled GCC binaries&mdash;those binaries won't run on the
+          host.  The GCC build system will attempt to use the host's
+          C and C++ compilers as a workaround by default.
+          Building the GCC target libraries with a different
+          version of GCC is not supported, so using the host's compilers may cause
+          the build to fail. This parameter ensures the libraries are built by GCC
+          pass 1.</para>
         </listitem>
       </varlistentry>
@@ -136 +135 @@
         <listitem>
           <para>Allow <filename class="libraryfile">libstdc++</filename> to
-          use shared <filename class="libraryfile">libgcc</filename> being
-          built in this pass, instead of the static version built in GCC
-          pass 1. This is needed for supporting C++ exception
+          use the shared <filename class="libraryfile">libgcc</filename> being
+          built in this pass, instead of the static version that was built in GCC
+          pass 1. This is necessary to support C++ exception
           handling.</para>
         </listitem>

chapter06/introduction.xml

@@ -17 +17 @@
   linking.</para>
 
-  <para>Using the utilities will be possible in next chapter after entering
+  <para>Using the utilities will be possible in the next chapter after entering
   the <quote>chroot</quote> environment. But all the packages built in the
   present chapter need to be built before we do that. Therefore we cannot be

chapter06/make.xml

@@ -43 +43 @@
     <title>Installation of Make</title>
 
+    <para>First, fix an issue identified upstream:</para>
+
+<screen><userinput remap="pre">sed -e '/ifdef SIGPIPE/,+2 d' \
+    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \
+    -i src/main.c</userinput></screen>
+
     <para>Prepare Make for compilation:</para>
 

chapter06/ncurses.xml

@@ -120 +120 @@
         <listitem>
           <para>This ensures that Ncurses does not build support for the Ada
-          compiler which may be present on the host but will not be available
+          compiler, which may be present on the host but will not be available
           once we enter the <command>chroot</command> environment.</para>
         </listitem>
@@ -128 +128 @@
         <term><parameter>--disable-stripping</parameter></term>
         <listitem>
-          <para>This switch prevents the building system from stripping
-          the programs using <command>strip</command> program from the host.
-          Using host tools on cross-compiled program can cause failure.</para>
+          <para>This switch prevents the building system from
+          using the <command>strip</command> program from the host.
+          Using host tools on cross-compiled programs can cause failure.</para>
         </listitem>
       </varlistentry>
@@ -170 +170 @@
         <term><parameter>TIC_PATH=$(pwd)/build/progs/tic</parameter></term>
         <listitem>
-          <para>We need to pass the path of the just built
-          <command>tic</command> able to run on the building machine, so that
+          <para>We need to pass the path of the newly built
+          <command>tic</command> program that runs on the building machine, so
           the terminal database can be created without errors.</para>
         </listitem>