r5746 - in trunk/BOOK: general/genutils introduction/welcome

dnicholson at linuxfromscratch.org dnicholson at linuxfromscratch.org
Sat Mar 25 13:41:00 PST 2006


Author: dnicholson
Date: 2006-03-25 14:40:58 -0700 (Sat, 25 Mar 2006)
New Revision: 5746

Modified:
   trunk/BOOK/general/genutils/bc.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Fixed #1846 for bc.  Replaced patches with sed's.  Added testsuite commands.

Modified: trunk/BOOK/general/genutils/bc.xml
===================================================================
--- trunk/BOOK/general/genutils/bc.xml	2006-03-25 17:54:25 UTC (rev 5745)
+++ trunk/BOOK/general/genutils/bc.xml	2006-03-25 21:40:58 UTC (rev 5746)
@@ -7,9 +7,9 @@
   <!ENTITY bc-download-http "http://ftp.gnu.org/gnu/bc/bc-&bc-version;.tar.gz">
   <!ENTITY bc-download-ftp "ftp://ftp.gnu.org/gnu/bc/bc-&bc-version;.tar.gz">
   <!ENTITY bc-md5sum "d44b5dddebd8a7a7309aea6c36fda117">
-  <!ENTITY bc-size "278 KB">
-  <!ENTITY bc-buildsize "2.31 MB">
-  <!ENTITY bc-time "0.04 SBU">
+  <!ENTITY bc-size "273 KB">
+  <!ENTITY bc-buildsize "2.36 MB">
+  <!ENTITY bc-time "less than 0.1 SBU (0.2 SBU if running the testsuite)">
 ]>
 
 <sect1 id="bc" xreflabel="bc-&bc-version;">
@@ -58,24 +58,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/bc-&bc-version;-flex_invocation-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/bc-&bc-version;-readline-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Bc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink>
-    (as an alternative to readline)</para>
-
   </sect2>
 
   <sect2 role="installation">
@@ -83,12 +65,20 @@
 
     <para>Install <application>bc</application> by running the following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../bc-&bc-version;-flex_invocation-1.patch &&
-patch -Np1 -i ../bc-&bc-version;-readline-1.patch &&
+<screen><userinput>sed -i '/PROTO.*readline/d' bc/scan.l &&
+sed -i '/flex -I8/s/8//' configure &&
+sed -i '/stdlib/a #include <string.h>' lib/number.c &&
+sed -i 's/program.*save/static &/' bc/load.c &&
 ./configure --prefix=/usr --with-readline &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>To test <application>bc</application>, run the commands below.
+    There is quite a bit of output, so you may want to redirect it to a file. 
+    Some tests are known to fail, but <application>bc</application> is still
+    useable.</para>
+<screen><userinput>for TEST in Test/{checklib,testfn}.b& do
+    echo "quit" | ./bc/bc -l $TEST
+done</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -96,6 +86,27 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i '/PROTO.*readline/d' bc/scan.l</command>: This
+    command fixes the <application>Readline</application> library call.</para>
+
+    <para><command>sed -i '/flex -I8/s/8//' configure</command>: This
+    command fixes the <application>Flex</application> invocation.</para>
+
+    <para><command>sed -i '/stdlib/a #include <string.h>' lib/number.c</command>:
+    This command inserts a missing header.</para>
+
+    <para><command>sed -i 's/program.*save/static &/' bc/load.c</command>:
+    This command fixes a segfault when running <application>bc</application>
+    with <command>bc -l</command>.</para>
+
+    <para><parameter>--with-readline</parameter>: This option enables
+    <application>Readline</application> support in interactive mode.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-03-25 17:54:25 UTC (rev 5745)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-03-25 21:40:58 UTC (rev 5746)
@@ -49,6 +49,11 @@
           updated) and corrected two instructions where $XORG_CONFIG should
           be used.</para>
         </listitem>
+        <listitem>
+          <para>[dnicholson] - Removed patches in Bc and replaced with
+          equivalent sed's.  Fixed segmentation faults with bc -l.  Fixes
+          #1846.  Added commands for test suite.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 




More information about the blfs-book mailing list