[Clfs-commits] commit: r4046 - in /trunk/BOOK: final-system/multilib/ final-system/ppc64/ final-system/sparc64/ final-system/x86_64/ introduction/common/

[svn at cross-lfs.org]

Author: jciccone
Date: Thu Oct  2 23:48:31 2008
New Revision: 4046

Log:
Wrap libtool by the multiarch wrapper making it more multilib friendly.

Modified:
    trunk/BOOK/final-system/multilib/libtool-64bit.xml
    trunk/BOOK/final-system/multilib/libtool-n32.xml
    trunk/BOOK/final-system/multilib/libtool.xml
    trunk/BOOK/final-system/ppc64/libtool.xml
    trunk/BOOK/final-system/sparc64/libtool.xml
    trunk/BOOK/final-system/x86_64/libtool.xml
    trunk/BOOK/introduction/common/changelog.xml

Modified: trunk/BOOK/final-system/multilib/libtool-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/libtool-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/libtool-64bit.xml Thu Oct  2 23:48:31 2008
@@ -54,6 +54,12 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="libtool.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>mv -v /usr/bin/libtool{,64}</userinput></screen>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/libtool-n32.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/libtool-n32.xml (original)
+++ trunk/BOOK/final-system/multilib/libtool-n32.xml Thu Oct  2 23:48:31 2008
@@ -56,6 +56,12 @@
     href="libtool.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="libtool.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-n32}</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/libtool.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/libtool.xml (original)
+++ trunk/BOOK/final-system/multilib/libtool.xml Thu Oct  2 23:48:31 2008
@@ -92,6 +92,11 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <para os="m1">Prepare <filename>libtool</filename> to be wrapped by
+    the multiarch wrapper. Libtool by itself is not multilib aware:</para>
+
+<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/ppc64/libtool.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64/libtool.xml (original)
+++ trunk/BOOK/final-system/ppc64/libtool.xml Thu Oct  2 23:48:31 2008
@@ -69,6 +69,12 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/libtool.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/sparc64/libtool.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64/libtool.xml (original)
+++ trunk/BOOK/final-system/sparc64/libtool.xml Thu Oct  2 23:48:31 2008
@@ -69,6 +69,12 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/libtool.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/x86_64/libtool.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64/libtool.xml (original)
+++ trunk/BOOK/final-system/x86_64/libtool.xml Thu Oct  2 23:48:31 2008
@@ -69,6 +69,12 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/libtool.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Thu Oct  2 23:48:31 2008
@@ -35,6 +35,16 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>October 2, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Wrap Libtool by the Multiarch wrapper making it
+          more multilib compatible.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>September 21, 2008</para>