Changeset 5183e68 for BOOK/final-system/multilib

Timestamp:

Jun 20, 2014, 10:06:58 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

44472aa

Parents:

cfe7ec9

git-author:

Chris Staub <chris@…> (06/20/14 22:06:44)

git-committer:

Chris Staub <chris@…> (06/20/14 22:06:58)

Message:

Updated gmp doc install instructions

Location:

BOOK/final-system/multilib

Files:

• gmp-64bit.xml (modified) (2 diffs)
• gmp-n32.xml (modified) (2 diffs)
• gmp.xml (modified) (2 diffs)

BOOK/final-system/multilib/gmp-64bit.xml

@@ -44 +44 @@
 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"
@@ -82 +83 @@
     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'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para os="l">Finally, create a stub header in the place of the originals:</para>
+    <para os="n">Create the 64bit header file:</para>
 
-<screen os="m"><userinput>cat &gt; /usr/include/gmp.h &lt;&lt; "EOF"
+<screen os="o"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
+
+    <para os="p">Finally, create a stub header in the place of the originals:</para>
+
+<screen os="q"><userinput>cat &gt; /usr/include/gmp.h &lt;&lt; "EOF"
 /* gmp.h - Stub Header  */
 #ifndef __STUB__GMP_H__

BOOK/final-system/multilib/gmp-n32.xml

@@ -58 +58 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -76 +68 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="j">Create the N32 header file:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <para os="l">Create the N32 header file:</para>
+
+<screen os="m"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/gmp.xml

@@ -56 +56 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -74 +66 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <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>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <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="m"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
 
   </sect2>