[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1277-g4c68291
git
git at cross-lfs.org
Fri Jun 20 22:07:11 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 4c682912a191085f844699198ec7c93ad707fba9 (commit)
from 37dd4bdfa15994f31bc898ad8001a50d634e34cf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4c682912a191085f844699198ec7c93ad707fba9
Author: Chris Staub <chris at beaker67.com>
Date: Sat Jun 21 01:06:44 2014 -0400
Updated gmp doc install instructions
diff --git a/BOOK/final-system/common/gmp.xml b/BOOK/final-system/common/gmp.xml
index 32a5937..157e160 100644
--- a/BOOK/final-system/common/gmp.xml
+++ b/BOOK/final-system/common/gmp.xml
@@ -50,30 +50,33 @@ mv -v config{fsf,}.sub</screen>
<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
CXX="g++ -isystem /usr/include" \
LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
- ./configure --prefix=/usr --enable-cxx</userinput></screen>
+ ./configure --prefix=/usr --enable-cxx \
+ --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
<para os="c">Compile the package:</para>
<screen os="d"><userinput>make</userinput></screen>
- <important os="e">
+ <para os="e">Build the HTML documentation:</para>
+
+<screen os="f"><userinput>make html</userinput></screen>
+
+ <important os="g">
<para>The test suite for GMP is considered
critical. Do not skip it under any circumstance.</para>
</important>
- <para os="f">Test the results:</para>
+ <para os="h">Test the results:</para>
-<screen os="g"><userinput remap="test">make check</userinput></screen>
+<screen os="i"><userinput remap="test">make check</userinput></screen>
- <para os="h">Install the package:</para>
+ <para os="j">Install the package:</para>
-<screen os="i"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
- <para os="j">Install the documentation:</para>
+ <para os="l">Install the documentation:</para>
-<screen os="k"><userinput>mkdir -v /usr/share/doc/gmp-&gmp-version;
-cp -v doc/{isa_abi_headache,configuration} doc/*.html \
- /usr/share/doc/gmp-&gmp-version;</userinput></screen>
+<screen os="m"><userinput>make install-html</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/mips64/gmp-64bit.xml b/BOOK/final-system/mips64/gmp-64bit.xml
index b9d0105..f2e53f9 100644
--- a/BOOK/final-system/mips64/gmp-64bit.xml
+++ b/BOOK/final-system/mips64/gmp-64bit.xml
@@ -73,17 +73,33 @@
xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/gmp-64bit.xml"
+ href="../common/gmp.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/gmp-64bit.xml"
+ href="../common/gmp.xml"
xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/gmp-64bit.xml"
+ href="../common/gmp.xml"
xpointer="xpointer(//*[@os='l'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gmp.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../multilib/gmp-64bit.xml"
+ xpointer="xpointer(//*[@os='n'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../multilib/gmp-64bit.xml"
+ xpointer="xpointer(//*[@os='o'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../multilib/gmp-64bit.xml"
+ xpointer="xpointer(//*[@os='p'])"/>
+
<screen os="m"><userinput>cat > /usr/include/gmp.h << "EOF"
/* gmp.h - Stub Header */
#ifndef __STUB__GMP_H__
diff --git a/BOOK/final-system/multilib/gmp-64bit.xml b/BOOK/final-system/multilib/gmp-64bit.xml
index fe2adc1..4544f38 100644
--- a/BOOK/final-system/multilib/gmp-64bit.xml
+++ b/BOOK/final-system/multilib/gmp-64bit.xml
@@ -43,7 +43,8 @@
CXX="g++ -isystem /usr/include ${BUILD64}" \
LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
./configure --prefix=/usr \
- --libdir=/usr/lib64 --enable-cxx</userinput></screen>
+ --libdir=/usr/lib64 --enable-cxx \
+ --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
@@ -81,13 +82,21 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
href="../common/gmp.xml"
xpointer="xpointer(//*[@os='k'])"/>
- <para os="j">Create the 64bit header file:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gmp.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gmp.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
+
+ <para os="n">Create the 64bit header file:</para>
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+<screen os="o"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
- <para os="l">Finally, create a stub header in the place of the originals:</para>
+ <para os="p">Finally, create a stub header in the place of the originals:</para>
-<screen os="m"><userinput>cat > /usr/include/gmp.h << "EOF"
+<screen os="q"><userinput>cat > /usr/include/gmp.h << "EOF"
/* gmp.h - Stub Header */
#ifndef __STUB__GMP_H__
#define __STUB__GMP_H__
diff --git a/BOOK/final-system/multilib/gmp-n32.xml b/BOOK/final-system/multilib/gmp-n32.xml
index bacdb66..d19c7b1 100644
--- a/BOOK/final-system/multilib/gmp-n32.xml
+++ b/BOOK/final-system/multilib/gmp-n32.xml
@@ -57,27 +57,27 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='h'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='i'])"/>
+ xpointer="xpointer(//*[@os='k'])"/>
- <para os="j">Create the N32 header file:</para>
+ <para os="l">Create the N32 header file:</para>
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
+<screen os="m"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/gmp.xml b/BOOK/final-system/multilib/gmp.xml
index f582def..df46eeb 100644
--- a/BOOK/final-system/multilib/gmp.xml
+++ b/BOOK/final-system/multilib/gmp.xml
@@ -55,27 +55,27 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='h'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
- xpointer="xpointer(//*[@os='i'])"/>
+ xpointer="xpointer(//*[@os='k'])"/>
- <para os="j">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
+ <para os="l">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
+<screen os="m"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
</sect2>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 0c64f7d..3d678af 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -47,6 +47,10 @@
<listitem>
<para>[William Harrington] - Add Linux sublevel patch.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Changed GMP documentation installation instructions
+ to use the Makefile to install docs instead of doing so manually.</para>
+ </listitem>
</itemizedlist>
</listitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/gmp.xml | 23 +++++++++++++----------
BOOK/final-system/mips64/gmp-64bit.xml | 22 +++++++++++++++++++---
BOOK/final-system/multilib/gmp-64bit.xml | 19 ++++++++++++++-----
BOOK/final-system/multilib/gmp-n32.xml | 14 +++++++-------
BOOK/final-system/multilib/gmp.xml | 14 +++++++-------
BOOK/introduction/common/changelog.xml | 4 ++++
6 files changed, 64 insertions(+), 32 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list