Changeset 001becd for BOOK/final-system/multilib

Timestamp:

Dec 12, 2006, 11:09:26 PM (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:

8d87eba

Parents:

30f7bcd

Message:

Added Readline Upstream Patch

Location:

BOOK/final-system/multilib

Files:

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

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

@@ -24 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+   ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49 +65 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+<screen os="j"><userinput>chmod -v 755 /lib64/lib{readline,history}.so*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -57 +71 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
-<screen os="l"><userinput>chmod -v 755 /lib64/lib{readline,history}.so*</userinput></screen>
+<screen os="l"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
-
-    <para os="o">Next, remove the <filename class="extension">.so</filename>
+    <para os="m">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="p"><userinput>rm -v /lib64/lib{readline,history}.so
+<screen os="n"><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

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -46 +66 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+<screen os="j"><userinput>chmod -v 755 /lib32/lib{readline,history}.so*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54 +72 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
+<screen os="l"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
 
-<screen os="k"><userinput>chmod -v 755 /lib32/lib{readline,history}.so*</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="m"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-
-    <para os="n">Next, remove the <filename class="extension">.so</filename>
+    <para os="m">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="o"><userinput>rm -v /lib32/lib{readline,history}.so
+<screen os="n"><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

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+   ./configure --prefix=/usr --libdir=/lib</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr --libdir=/lib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69 +85 @@
     href="../common/readline.xml"
     xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
   </sect2>