r2148 - / trunk/BOOK/final-system trunk/BOOK/final-system/x86_64 trunk/BOOK/introduction/x86_64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jul 24 04:45:15 PDT 2006


Author: jim
Date: 2006-07-24 05:45:09 -0600 (Mon, 24 Jul 2006)
New Revision: 2148

Added:
   trunk/BOOK/final-system/x86_64/libtool.xml
Modified:
   /
   trunk/BOOK/final-system/x86_64-chapter.xml
   trunk/BOOK/introduction/x86_64/changelog.xml
Log:
 r4917 at server (orig r2269):  ken | 2006-07-24 04:14:04 -0700
 Try to fix 32-bit libtool tests on x86_64.



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2268
   + b6734a72-470d-0410-b049-f317dca95413:/:2269

Added: trunk/BOOK/final-system/x86_64/libtool.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/libtool.xml	                        (rev 0)
+++ trunk/BOOK/final-system/x86_64/libtool.xml	2006-07-24 11:45:09 UTC (rev 2148)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libtool-32" role="wrap">
+  <?dbhtml filename="libtool.html"?>
+
+  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-libtool-32">
+    <primary sortas="a-Libtool">Libtool</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/libtool.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libtool</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/libtool.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <para os="e">To test the results, issue:
+    <userinput>make LDEMULATION=elf_i386 check</userinput>.</para>
+
+    <variablelist os="c">
+      <title>The meaning of the override on make check:</title>
+
+      <varlistentry>
+        <term><parameter>LDEMULATION=elf_i386</parameter></term>
+	<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+	href="../ppc64/libtool.xml"
+	xpointer="xpointer(//*[@os='c2'])"/>
+      </varlistentry>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-libtool" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/final-system/x86_64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-chapter.xml	2006-07-24 07:49:26 UTC (rev 2147)
+++ trunk/BOOK/final-system/x86_64-chapter.xml	2006-07-24 11:45:09 UTC (rev 2148)
@@ -30,7 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>

Modified: trunk/BOOK/introduction/x86_64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-24 07:49:26 UTC (rev 2147)
+++ trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-24 11:45:09 UTC (rev 2148)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 24, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Add an LDEMULATION when we run the 32-bit libtool
+	  testsuite.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 14, 2006</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list