Author: randy
Date: 2010-11-17 18:21:28 -0700 (Wed, 17 Nov 2010)
New Revision: 8698
Modified:
trunk/BOOK/general/prog/guile.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added a patch to the Guile instructions to fix breakage using newer compilers,
also fixed the documentation installation instructions
Modified: trunk/BOOK/general/prog/guile.xml
===================================================================
--- trunk/BOOK/general/prog/guile.xml 2010-11-18 01:06:14 UTC (rev 8697)
+++ trunk/BOOK/general/prog/guile.xml 2010-11-18 01:21:28 UTC (rev 8698)
@@ -55,17 +55,13 @@
</listitem>
</itemizedlist>
- <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>Required patch: <ulink
- url="&patch-root;/guile-&guile-version;-gcc4-1.patch"/></para>
+ url="&patch-root;/guile-&guile-version;-snarf-1.patch"/></para>
</listitem>
- <listitem>
- <para>Required patch: <ulink
- url="&patch-root;/guile-&guile-version;-slib-1.patch"/></para>
- </listitem>
- </itemizedlist> -->
+ </itemizedlist>
<bridgehead renderas="sect3">Guile Dependencies</bridgehead>
@@ -90,22 +86,29 @@
-disable-static -enable-networking -enable-regex &&
make</userinput></screen> -->
-<screen><userinput>./configure --prefix=/usr &&
+<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</userinput></screen>
+ doc/tutorial/guile-tut.texi &&
+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"/> installed and wish to
- build alternate formats of the documentation, issue the following
- commands:</para>
+ build alternate formats (PDF and postscript) of the documentation, issue
+ the following commands:</para>
<screen><userinput>for DIRNAME in goops r5rs ref tutorial
do
- make -k -C doc/$DIRNAME pdf ps html
+ make -k -C doc/${DIRNAME} pdf ps
done &&
unset DIRNAME</userinput></screen>
@@ -121,10 +124,21 @@
for DIRNAME in goops r5rs ref tutorial
do
- install -v -m755 -d
/usr/share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}/$DIRNAME &&
- install -v -m644 doc/$DIRNAME/*.txt \
-
/usr/share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}/$DIRNAME
+ install -v -m755 -d /usr/share/doc/guile-&guile-version;/${DIRNAME}
&&
+ install -v -m644 doc/${DIRNAME}/*.txt \
+ /usr/share/doc/guile-&guile-version;/${DIRNAME}
&&
+ if [ -d doc/${DIRNAME}/${DIRNAME}.html ]; then
+ cp -v -R doc/${DIRNAME}/${DIRNAME}.html \
+ /usr/share/doc/guile-&guile-version;/${DIRNAME}
+ 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>
<para>If you built the alternate formats of the documentation, install them
@@ -133,38 +147,12 @@
<screen role="root"><userinput>for DIRNAME in goops r5rs ref tutorial
do
- install -v -m755 -d /usr/share/doc/guile-&guile-version;/$DIRNAME/html
&&
- install -v -m644 doc/$DIRNAME/*.{pdf,ps,dvi} \
- /usr/share/doc/guile-&guile-version;/$DIRNAME
&&
- if [ -d doc/$DIRNAME/$DIRNAME.html ]; then
- install -v -m644 doc/$DIRNAME/$DIRNAME.html/* \
- /usr/share/doc/guile-&guile-version;/$DIRNAME/html
- fi
-done &&
+ install -v -m644 doc/${DIRNAME}/*.{pdf,ps,dvi} \
+ /usr/share/doc/guile-&guile-version;/${DIRNAME}
+done</userinput></screen>
-install -v -m644 doc/goops/hierarchy.{eps,png} \
- /usr/share/doc/guile-&guile-version;/goops &&
-install -v -m644 doc/ref/guile.html/* \
- /usr/share/doc/guile-&guile-version;/ref/html &&
-install -v -m644 doc/tutorial/guile-tut.html/* \
-
/usr/share/doc/guile-&guile-version;/tutorial/html</userinput></screen>
</sect2>
- <!-- Commenting these out (as well as the actual build command) because they
- are the default. Examine configure.(ac,in) and you will see that if not
- specified, all 3 of these options are enabled by default.
- <sect2 role="commands">
- <title>Command Explanations</title>
-
- <para><option>-enable-posix</option>: Enable Posix interfaces.</para>
-
- <para><option>-enable-networking</option>: Enable networking
interfaces.</para>
-
- <para><option>-enable-regex</option>: Enable regular expression
interfaces.</para>
-
- </sect2>
- -->
-
<sect2 role="content">
<title>Contents</title>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2010-11-18 01:06:14 UTC
(rev 8697)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2010-11-18 01:21:28 UTC
(rev 8698)
@@ -45,6 +45,11 @@
<para>November 18th, 2010</para>
<itemizedlist>
<listitem>
+ <para>[randy] - Added a patch to the Guile instructions to fix
+ breakage using newer compilers, also fixed the documentation
+ installation instructions.</para>
+ </listitem>
+ <listitem>
<para>[ken] - Updated to openssl-1.0.0b to fix CVE-2010-3864 (fixes
ticket
<ulink url="&blfs-ticket-root;3146">#3146</ulink>)</para>
</listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
