Changeset 725ef3b for chapter05

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

3e18fa2

Parents:

9382de3

git-author:

Thomas Trepl <thomas@…> (02/12/2020 09:02:11 PM)

git-committer:

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

Message:

MultiLib: Merge changes from trunk

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

Location:

chapter05

Files:

• e2fsprogs.xml (deleted)
• flex.xml (deleted)
• gcc-pass2.xml (modified) (2 diffs)
• generalinstructions.xml (modified) (1 diff)
• gmp.xml (deleted)
• make.xml (modified) (1 diff)
• mpfr.xml (deleted)
• tcl.xml (modified) (1 diff)

chapter05/gcc-pass2.xml

@@ -127 +127 @@
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
     -i gcc/graphite.h</userinput></screen>
+
+    <para>
+      Now fix a problem introduced by Glibc-2.31:
+    </para>
+
+<screen><userinput remap="pre">sed -e '1161 s|^|//|' \
+    -i libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc</userinput></screen>
 
     <para>Create a separate build directory again:</para>
@@ -257 +264 @@
     list. If the <envar>PATH</envar> is wrong it could mean that you are not
     logged in as user <systemitem class="username">lfs</systemitem> or that
-    something went wrong back in <xref linkend="ch-tools-settingenviron"
+    something went wrong back in <xref linkend="ch-preps-settingenviron"
     role="."/></para>
 

chapter05/generalinstructions.xml

@@ -54 +54 @@
 
       <para>The build instructions assume that the <xref
-      linkend='pre-hostreqs'/>, including symbolic links, have been set
-      properly:</para>
+      linkend='ch-partitioning-hostreqs'/>, including symbolic links, have
+      been set properly:</para>
 
       <itemizedlist role='important'>

chapter05/make.xml

@@ -42 +42 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
-
+<!--
     <para>First, work around an error caused by glibc-2.27 and later:</para>
 
 <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
-
+-->
     <para>Prepare Make for compilation:</para>
 

chapter05/tcl.xml

@@ -75 +75 @@
     for the duration of the test suite run. This ensures that the clock tests
     are exercised correctly. Details on the <envar>TZ</envar> environment
-    variable are provided in <xref linkend="chapter-bootscripts"/>.</para>
+    variable are provided in <xref linkend="chapter-config"/>.</para>
 
     <para>Install the package:</para>