Changeset 3d00c1ed for BOOK/final-system/multilib

Timestamp:

Jan 7, 2009, 10:55:12 AM (16 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:

de28452

Parents:

bf8339f

Message:

Cleanup Readline Build. Changed the way to link ncurses

Location:

BOOK/final-system/multilib

Files:

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

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

@@ -32 +32 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -61 +69 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
 
-<screen os="l"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
-
-    <para os="m">Next, remove the <filename class="extension">.so</filename>
+    <para os="j">Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib64</filename> and relink them into
     <filename class="directory">/usr/lib64</filename>.</para>
 
-<screen os="n"><userinput>rm -v /lib64/lib{readline,history}.so
+<screen os="k"><userinput>rm -v /lib64/lib{readline,history}.so
 ln -svf ../../lib64/libreadline.so.5 /usr/lib64/libreadline.so
 ln -svf ../../lib64/libhistory.so.5 /usr/lib64/libhistory.so</userinput></screen>

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

@@ -33 +33 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -62 +70 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
 
-<screen os="l"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-
-    <para os="m">Next, remove the <filename class="extension">.so</filename>
+    <para os="j">Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib32</filename> and relink them into
     <filename class="directory">/usr/lib32</filename>.</para>
 
-<screen os="n"><userinput>rm -v /lib32/lib{readline,history}.so
+<screen os="k"><userinput>rm -v /lib32/lib{readline,history}.so
 ln -svf ../../lib32/libreadline.so.5 /usr/lib32/libreadline.so
 ln -svf ../../lib32/libhistory.so.5 /usr/lib32/libhistory.so</userinput></screen>

BOOK/final-system/multilib/readline.xml

@@ -33 +33 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -64 +72 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
   </sect2>