Changeset f042859 for BOOK/final-system/multilib

Timestamp:

Dec 1, 2006, 10:01:27 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

7e7dd39

Parents:

e48d8c9

Message:

Text Updates for Procps

Location:

BOOK/final-system/multilib

Files:

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

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

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" m64=""</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -38 +38 @@
 <screen os="e"><userinput>make install lib64=lib64</userinput></screen>
 
+    <variablelist os="f">
+      <title>The meaning of the make and install options:</title>
+
+      <varlistentry os="f1">
+        <term><parameter>CC="gcc ${BUILD64}"</parameter></term>
+        <listitem>
+          <para>This allows us to compile using our gcc with our
+          options lists in ${BUILD64} variable.</para>
+        </listitem>
+      </varlistentry>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/procps.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/procps.xml"
+    xpointer="xpointer(//*[@os='f3'])"/>
+
+  </variablelist>
+
   </sect2>
 

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

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILDN32}" m64=""</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -37 +37 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
+
 <screen os="e"><userinput>make install lib64=lib32</userinput></screen>
+
+    <variablelist os="f">
+      <title>The meaning of the make and install options:</title>
+
+      <varlistentry os="f1">
+        <term><parameter>CC="gcc ${BUILDN32}"</parameter></term>
+        <listitem>
+          <para>This allows us to compile using our gcc with our
+          options lists in ${BUILDN32} variable.</para>
+        </listitem>
+      </varlistentry>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/procps.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/procps.xml"
+    xpointer="xpointer(//*[@os='f3'])"/>
+
+  </variablelist>
 
   </sect2>

BOOK/final-system/multilib/procps.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD32}" m64=""</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -37 +37 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="f"><userinput>make install lib64=lib</userinput></screen>
+<screen os="e"><userinput>make install lib64=lib</userinput></screen>
 
     <variablelist os="f">
@@ -43 +43 @@
 
       <varlistentry os="f1">
-        <term><parameter>m64=${BUILD32}</parameter></term>
+        <term><parameter>CC="gcc ${BUILD32}"</parameter></term>
+        <listitem>
+          <para>This allows us to compile using our gcc with our
+          options lists in ${BUILD32} variable.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="f2">
+        <term><parameter>m64=""</parameter></term>
         <listitem>
           <para>The <filename>Makefile</filename> for this package goes to some
           lengths to build as 64-bit if at all possible. In CLFS we build each
           library for each available ABI. Overriding the m64 option enables us
-          to specify the build options we want for it.</para>
+          ignore this completely.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="f2">
+      <varlistentry os="f3">
         <term><parameter>lib64=lib</parameter></term>
         <listitem>