From f7ca699b41537d9250167d4c90d8c4cc4a98ec39 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sat, 9 May 2020 10:49:56 +0000
Subject: merge trunk and add patch to gcc pass2

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11842 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/bison.xml     |  2 +-
 chapter06/e2fsprogs.xml |  2 +-
 chapter06/flex.xml      | 11 +++++++----
 chapter06/gcc.xml       |  2 --
 chapter06/gdbm.xml      |  4 ++++
 chapter06/man-db.xml    |  2 ++
 6 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index e36e323eb..23b6f0a95 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -62,7 +62,7 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>13 tests fail in the "Diagnostics" section, probably because of
+    <para>Fourteen tests fail in the "Diagnostics" section, probably because of
     missing locales.</para>
 
 <!--
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index daa9bb91f..984ba6db9 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -151,7 +151,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs,e2freefrag,
+        <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2freefrag,
         e2fsck, e2image, e2label, e2mmpstatus, e2scrub, e2scrub_all, e2undo,
         e4crypt, e4defrag, filefrag, fsck.ext2,
         fsck.ext3, fsck.ext4, logsave, lsattr, mk_cmds, mke2fs,
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 7bd8954ac..bd4bd545f 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,17 +41,20 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
+<!--
     <para>First, fix a problem introduced with glibc-2.26:</para>
 
 <screen><userinput remap="pre">sed -i "/math.h/a #include &lt;malloc.h&gt;" src/flexdef.h</userinput></screen>
 
     <para>The build procedure assumes the <application>help2man</application>
-    program is available to create a man page from the executable --help option.
+    program is available to create a man page from the executable - -help option.
     This is not present, so we use an environment variable to skip this process.
-    Now, prepare Flex for compilation:</para>
+    Now, prepare Flex for compilation:</para> -->
 
-<screen><userinput remap="configure">HELP2MAN=/bin/true \
-./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+    <para>Prepare Flex for compilation:</para>
+
+<!-- <screen><userinput remap="configure">HELP2MAN=/tools/bin/true \ -->
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 952e3cca7..c6d47d970 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -119,8 +119,6 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
     are known to fail in LFS chroot environment because they require
     /etc/hosts and iana-etc.</para>
 
-    <para>Two tests named pr57193.c and pr90178.c are known to fail.</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/chapter06/gdbm.xml b/chapter06/gdbm.xml
index ccb4ef1ba..f953b63f9 100644
--- a/chapter06/gdbm.xml
+++ b/chapter06/gdbm.xml
@@ -44,6 +44,10 @@
   <sect2 role="installation">
     <title>Installation of GDBM</title>
 
+    <para>First, fix an issue first identified by gcc-10:</para>
+
+<screen><userinput remap="pre">sed -r -i '/^char.*parseopt_program_(doc|args)/d' src/parseopt.c</userinput></screen>
+
     <para>Prepare GDBM for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 1ffdd556b..f2f46b891 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -126,6 +126,8 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>One test, man-missing-locales, is known to fail in the LFS chroot envirnment.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
-- 
cgit v1.2.3-54-g00ecf