r8960 - in trunk/BOOK: . general/prog introduction/welcome

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Sun Nov 13 20:24:39 PST 2011


Author: bdubbs
Date: 2011-11-13 21:24:35 -0700 (Sun, 13 Nov 2011)
New Revision: 8960

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/guile.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Update to guile-2.0.3

Modified: trunk/BOOK/general/prog/guile.xml
===================================================================
--- trunk/BOOK/general/prog/guile.xml	2011-11-13 22:15:57 UTC (rev 8959)
+++ trunk/BOOK/general/prog/guile.xml	2011-11-14 04:24:35 UTC (rev 8960)
@@ -6,10 +6,10 @@
 
   <!ENTITY guile-download-http "http://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
   <!ENTITY guile-download-ftp  "ftp://ftp.gnu.org/pub/gnu/guile/guile-&guile-version;.tar.gz">
-  <!ENTITY guile-md5sum        "991b5b3efcbbc3f7507d05bc42f80a5e">
-  <!ENTITY guile-size          "3.9 MB">
-  <!ENTITY guile-buildsize     "47 MB (additional 50 MB to install all the docs)">
-  <!ENTITY guile-time          "1.2 SBU">
+  <!ENTITY guile-md5sum        "f8b511ad43bbda0a1cbb1c52ceeebdf7">
+  <!ENTITY guile-size          "4 MB">
+  <!ENTITY guile-buildsize     "128 MB">
+  <!ENTITY guile-time          "7.7 SBU">
 ]>
 
 <sect1 id="guile" xreflabel="Guile-&guile-version;">
@@ -54,7 +54,7 @@
         <para>Estimated build time: &guile-time;</para>
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -62,14 +62,17 @@
         url="&patch-root;/guile-&guile-version;-snarf-1.patch"/></para>
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Guile Dependencies</bridgehead>
 
-    <!-- <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gmp"/></para> -->
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gc"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="emacs"/></para>
+    <para role="optional">
+      <xref linkend="emacs"/> and 
+      <xref linkend="libunistring"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/guile"/></para>
@@ -82,31 +85,20 @@
     <para>Install <application>Guile</application> by running the following
     commands:</para>
 
-<!-- <screen><userinput>./configure -prefix=/usr -enable-posix \
-    -disable-static -enable-networking -enable-regex &&
-make</userinput></screen> -->
+<screen><userinput>sed -i 's/gc_version.h/gc.h/' \
+    test-suite/standalone/test-pthread-create-secondary.c &&
 
-<screen><userinput>patch -Np1 -i ../guile-&guile-version;-snarf-1.patch &&
 ./configure --prefix=/usr &&
 make &&
 
-makeinfo --plaintext -o doc/goops/goops.txt doc/goops/goops.texi &&
 makeinfo --plaintext -o doc/r5rs/r5rs.txt   doc/r5rs/r5rs.texi   &&
-makeinfo --plaintext -o doc/ref/guile.txt   doc/ref/guile.texi   &&
-makeinfo --plaintext -o doc/tutorial/guile-tut.txt \
-                        doc/tutorial/guile-tut.texi              &&
+makeinfo --plaintext -o doc/ref/guile.txt   doc/ref/guile.texi</userinput></screen>
 
-for DIRNAME in goops r5rs ref tutorial
-do
-  make -k -C doc/${DIRNAME} html
-done &&
-unset DIRNAME</userinput></screen>
-
     <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
     installed and wish to build alternate formats (PDF and postscript) of the
     documentation, issue the following commands:</para>
 
-<screen><userinput>for DIRNAME in goops r5rs ref tutorial
+<screen><userinput>for DIRNAME in r5rs ref 
 do
   make -k -C doc/${DIRNAME} pdf ps 
 done &&
@@ -120,9 +112,9 @@
 
 find examples -name "Makefile*" -exec rm {} \; &&
 install -v -m755 -d /usr/share/doc/guile-&guile-version; &&
-cp -v -R examples   /usr/share/doc/guile-&guile-version; &&
+cp -vR examples   /usr/share/doc/guile-&guile-version; &&
 
-for DIRNAME in goops r5rs ref tutorial
+for DIRNAME in r5rs ref
 do
   install -v -m755 -d /usr/share/doc/guile-&guile-version;/${DIRNAME} &&
   install -v -m644    doc/${DIRNAME}/*.txt \
@@ -133,26 +125,27 @@
   fi
 done &&
 
-install -v -m644  doc/goops/hierarchy.* \
-                  /usr/share/doc/guile-&guile-version;/goops          &&
-cp -v -R          doc/ref/guile.html \
-                  /usr/share/doc/guile-&guile-version;/ref            &&
-cp -v -R          doc/tutorial/guile-tut.html \
-                  /usr/share/doc/guile-&guile-version;/tutorial       &&
-unset DIRNAME</userinput></screen>
+cp -v -R doc/ref/guile.html /usr/share/doc/guile-&guile-version;/ref</userinput></screen>
 
     <para>If you built the alternate formats of the documentation, install them
     using the following commands issued by the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>for DIRNAME in goops r5rs ref tutorial
+<screen role="root"><userinput>for DIRNAME in r5rs ref 
 do
   install -v -m644 doc/${DIRNAME}/*.{pdf,ps,dvi} \
                    /usr/share/doc/guile-&guile-version;/${DIRNAME}
 done</userinput></screen>
 
   </sect2>
+ <sect2 role="commands">
+    <title>Command Explanations</title>
 
+    <para><userinput>sed -i 's/gc_version.h/gc.h/' test-suite/...-secondary.c</userinput>: 
+    This command corrects an error that prevents the test suite from running.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -162,10 +155,9 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>guile, guile-config, guile-snarf, and guile-tools</seg>
-        <seg>libguile.{so,a}, libguile-srfi-srfi-*.{so,a} and
-        /libguilereadline-v-17.{so,a}</seg>
-        <seg>/usr/include/guile, /usr/include/libguile,
+        <seg>guild, guile, guile-config, guile-snarf, and guile-tools</seg>
+        <seg>libguile-2.0.{so,a} and /libguilereadline-v-18.{so,a}</seg>
+        <seg>/usr/include/guile, /usr/lib/guild,
         /usr/share/doc/guile-&guile-version; and /usr/share/guile</seg>
       </seglistitem>
     </segmentedlist>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2011-11-13 22:15:57 UTC (rev 8959)
+++ trunk/BOOK/general.ent	2011-11-14 04:24:35 UTC (rev 8960)
@@ -326,7 +326,7 @@
 <!ENTITY gc-version                   "7.1">
 <!ENTITY gcc-version                  "4.5.1">
 <!ENTITY gcc3-version                 "3.3.6">
-<!ENTITY guile-version                "1.8.7">
+<!ENTITY guile-version                "2.0.3">
 <!ENTITY icedtea6-version             "1.9.7">
 <!ENTITY jdk-version                  "6 Update 18">
 <!ENTITY junit-version                "4.8.1">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-11-13 22:15:57 UTC (rev 8959)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-11-14 04:24:35 UTC (rev 8960)
@@ -45,6 +45,9 @@
       <para>November 13th, 2011</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to guile-2.0.3.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to gc-7.1.</para>
         </listitem>
         <listitem>




More information about the blfs-book mailing list