Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

5 files changed, 28 insertions, 32 deletions

diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml
index c55d40836..79fdaaf97 100644
--- a/chapter07/createfiles.xml
+++ b/chapter07/createfiles.xml
@@ -48,7 +48,7 @@
   as well:</para>
 
 <screen><userinput>cat &gt; /etc/hosts &lt;&lt; EOF
-"127.0.0.1 localhost $(hostname)" 
+127.0.0.1  localhost $(hostname)
 ::1        localhost
 EOF</userinput></screen>
 
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index e2d32bba4..699a24e43 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -42,9 +42,9 @@
 
     <para>Prepare Bash for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                    \
+<screen><userinput remap="configure">./configure --prefix=/usr                      \
             --docdir=/usr/share/doc/bash-&bash-version; \
-            --without-bash-malloc            \
+            --without-bash-malloc              \
             --with-installed-readline</userinput></screen>
 
     <variablelist>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 840bddb03..82de879fa 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -121,28 +121,26 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
     url="&test-results;"/> and
     <ulink url="https://gcc.gnu.org/ml/gcc-testresults/"/>.</para>
 
- <!--    <para>In g++, three tests in constexpr-52830 are known to fail and
-    also to be treated as unexpected successes (XPASS).  This is because
-    an <quote>internal compiler error</quote> on this test is fixed, but
-    the compiler still rejects some valid code.</para>
- -->
-    <!--  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96322
-          https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71367 -->
+    <!-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101081 -->
+    <para>Eight tests related to analyzer are known to fail.</para>
+
+    <!-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101749 -->
+    <para>Seven tests related to <filename>pr59063-2.c</filename> are known
+    to fail.</para>
+
+    <!-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101751 -->
+    <para>One test named <filename>asan_test.C</filename> is known to
+    fail.</para>
+
+    <!-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100117 -->
+    <para>In libstdc++, one test named <filename>49745.cc</filename> is
+    known to fail because the header dependencies in glibc have have
+    changed.</para>
 
     <para>In libstdc++, one numpunct test and six tests related to get_time are
     known to fail.  These are all because the locale definitions in glibc have
     changed but libstdc++ does not currently support those changes.</para>
 
-<!--<para>Additionally the following tests related to the following files
-    are known to fail with glibc-2.33: asan_test.C, co-ret-17-void-ret-coro.C, 
-    pr95519-05-gro.C, pr80166.c.</para>
--->
-
-<!-- don't fail anymore after the move of iana-etc and /etc/hosts
-    <para>Two tests named lookup.cc and reverse.cc in experimental/net
-    are known to fail in LFS chroot environment because they require
-    /etc/hosts and iana-etc.</para>
--->
     <para>A few unexpected failures cannot always be avoided. The GCC developers
     are usually aware of these issues, but have not resolved them yet.
     Unless the test results are vastly different from those at the above URL,
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 2935c84af..675adf633 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -939,7 +939,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
       <varlistentry id="libutil">
         <term><filename class="libraryfile">libutil</filename></term>
         <listitem>
-          <para>>Dummy library containing no functions. Previously contained
+          <para>Dummy library containing no functions. Previously contained
           code for <quote>standard</quote> functions used in
           many different Unix utilities. These functions are now in
           <filename class="libraryfile">libc</filename></para>
diff --git a/chapter08/strippingagain.xml b/chapter08/strippingagain.xml
index 825cd20e2..7692f6ce9 100644
--- a/chapter08/strippingagain.xml
+++ b/chapter08/strippingagain.xml
@@ -43,12 +43,11 @@
 <!-- also of interest are libgfortan, libgo, libgomp, and libobjc from GCC -->
 
 <!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
-      <screen><userinput>save_usrlib="ld-linux-x86-64.so.2
+<screen><userinput>save_usrlib="ld-linux-x86-64.so.2
              libc.so.6
-             libpthread.so.6 
-             libthread_db.so
+             libthread_db.so.1
              libquadmath.so.&libquadmath-version; 
-             libstdc++.so.6
+             libstdc++.so.&libstdcpp-version;
              libitm.so.&libitm-version; 
              libatomic.so.&libatomic-version;" 
 
@@ -64,13 +63,12 @@ for LIB in $save_usrlib; do
 done
 
 online_usrbin="bash find strip"
-online_usrlib="libbfd.so 
-               libdl.so.2
-               libhistory.so
-               libncursesw.so
-               libm.so.6 
-               libreadline.so
-               libz.so
+online_usrlib="libbfd-&binutils-version;.so
+               libhistory.so.&readline-version;
+               libncursesw.so.&ncurses-version;
+               libm.so.6
+               libreadline.so.&readline-version;
+               libz.so.&zlib-version;
                $(cd /usr/lib; find libnss*.so* -type f)"
 
 for BIN in $online_usrbin; do