Update several pages to fix regression test failures.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10316 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 20 insertions, 9 deletions

diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index ee890bef1..4f0c6bba1 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -43,14 +43,14 @@
     <para>Prepare Bison for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
-
+<!--
     <para>The configure system causes Bison to be built without support for
     internationalization of error messages if a <command>bison</command>
     program is not already in $PATH. The following addition will correct
     this:</para>
 
 <screen><userinput remap="configure">echo '#define YYENABLE_NLS 1' &gt;&gt; lib/config.h</userinput></screen>
-
+-->
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
@@ -59,6 +59,8 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>One test will fail due to not having flex available yet.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index a155e8308..b984f1a11 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -40,6 +40,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
@@ -54,7 +55,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 390cdbe31..5d7fe3ae4 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -60,8 +60,8 @@
     <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure \
-            --prefix=/usr         \
-            --libexecdir=/usr/lib \
+            --prefix=/usr            \
+            --libexecdir=/usr/lib    \
             --enable-no-install-program=kill,uptime</userinput></screen>
 
     <variablelist>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index cdc47822e..25be981f7 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,6 +44,10 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
+    <para>First, fix a regression test:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/mke2fs/$MKE2FS/' -e 's/debugfs/$DEBUGFS/' tests/f_extent_oobounds/script</userinput></screen>
+
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index a331d669c..ab2984ca4 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,13 +41,13 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-    <para>First, fix some regression tests:</para>
+    <para>First, skip running three regression tests that require bison.</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&flex-bison-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -i -e '/test-bison/d' tests/Makefile.in</userinput></screen>
 
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr             \
+<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/glibc.xml b/chapter06/glibc.xml
index 56621ebd3..1eb09582f 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -138,6 +138,11 @@ grep Error glibc-check-log</userinput></screen>
       </listitem>
 
       <listitem>
+        <para>posix/tst-getaddrinfo4 will always fail due to not having a network
+        connection when the test is run.</para>
+      </listitem>
+
+      <listitem>
         <para>Other tests known to fail on some architectures are posix/bug-regex32,
         misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, and stdio-common/bug22.</para>
       </listitem>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 4d9122552..517062461 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -49,7 +49,7 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <note><para>Two tests in the test suite fail due to out of date
+    <note><para>One test in the test suite fails due to out of date
     perl code.</para></note>
 
     <para>To test the results, issue:</para>