From 12a27da73005362f481354d368781b8d9761c72e Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 15 Jul 2019 01:56:52 +0000
Subject: Fix testing of binutils-2.32 gold linker. Update to tzdata-2019b.
 Update to python3-3.7.4. Update to meson-0.51.1. Update to iproute2-5.2.0.
 Update to grub-2.04. Update to linux-5.2.1. Update to bc-2.1.0. Update to
 bzip2-1.0.8.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11639 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/bc.xml       | 42 ++++++++++++++++++++++++++++++++----------
 chapter06/binutils.xml |  8 +++++++-
 2 files changed, 39 insertions(+), 11 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/bc.xml b/chapter06/bc.xml
index 48ea215fb..154ed5c8f 100644
--- a/chapter06/bc.xml
+++ b/chapter06/bc.xml
@@ -40,7 +40,7 @@
 
   <sect2 role="installation">
     <title>Installation of Bc</title>
-
+<!--
     <para>First, change an internal script to use <command>sed</command> instead 
     of <command>ed</command>:</para>
 
@@ -69,19 +69,21 @@ ln -sfv libncursesw.so.6 /usr/lib/libncurses.so</userinput></screen>
     files in the early stages of LFS:</para>
 
 <screen><userinput remap="pre">sed -i -e '/flex/s/as_fn_error/: ;; # &amp;/' configure</userinput></screen>
-
+-->
     <para>Prepare Bc for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr           \
-            --with-readline         \
-            --mandir=/usr/share/man \
-            --infodir=/usr/share/info</userinput></screen>
+<!--
+<screen><userinput remap="configure">./configure - -prefix=/usr           \
+            - -with-readline         \
+            - -mandir=/usr/share/man \
+            - -infodir=/usr/share/info</userinput></screen>
+-->
+<screen><userinput remap="configure">PREFIX=/usr CC=gcc CFLAGS="-std=c99" ./configure.sh -G -O3</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
-
+<!--
       <varlistentry>
-        <term><parameter>--with-readline</parameter></term>
+        <term><parameter>- -with-readline</parameter></term>
         <listitem>
           <para>This option tells Bc to use the <filename
           class="libraryfile">readline</filename> library that is already
@@ -89,19 +91,39 @@ ln -sfv libncursesw.so.6 /usr/lib/libncurses.so</userinput></screen>
           version.</para>
         </listitem>
       </varlistentry>
+-->
+      <varlistentry>
+        <term><parameter>CC=gcc CFLAGS="-std=c99"</parameter></term>
+        <listitem>
+          <para>These parameters specify the compiler and C standard to use.</para>
+        </listitem>
+      </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-G -O3</parameter></term>
+        <listitem>
+          <para>These parameters specify the optimization to use. Debug symbols 
+          will be retained.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
-
+<!--
     <para>To test bc, run the commands below. There is quite a bit of output,
     so you may want to redirect it to a file. There are a very small percentage
     of tests (10 of 12,144) that will indicate a round off error at the last
     digit.</para>
 
 <screen><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
+-->
+
+    <para>To test bc, run:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
 
     <para>Install the package:</para>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 95a263939..3d7f532e5 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -57,6 +57,11 @@
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
 
+    <para>Now remove one test that prevents the tests from running
+    to completion:</para>
+
+<screen><userinput remap="pre">sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils 
     in a dedicated build directory:</para>
 
@@ -152,7 +157,8 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">make -k check</userinput></screen>
 
-    <para>One test, debug_msg.sh, is known to fail.</para>
+    <para>The PC-relative offset test and  
+    the debug_msg.sh test may fail in the LFS environment.</para>
 
     <para>Install the package:</para>
 
-- 
cgit v1.2.3-54-g00ecf