Author: jim
Date: 2006-07-29 17:37:22 -0600 (Sat, 29 Jul 2006)
New Revision: 2162

Modified:
   /
   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/mips64/changelog.xml
Log:
 [EMAIL PROTECTED] (orig r2287):  ken | 2006-07-29 15:47:06 -0700
 Finish the fix for libtool-32 test failure, and move the detail back into 
multilib/libtool.xml because multilib referencing an item in ppc64 and ppc64 
referencing a different item in multilib causes recursion which prevents it 
rendering.



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

Modified: trunk/BOOK/final-system/multilib/libtool-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/libtool-n32.xml    2006-07-29 23:37:15 UTC 
(rev 2161)
+++ trunk/BOOK/final-system/multilib/libtool-n32.xml    2006-07-29 23:37:22 UTC 
(rev 2162)
@@ -30,16 +30,17 @@
    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="libtool.xml"
+    href="../common/libtool.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="libtool.xml"
+    href="../common/libtool.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="libtool.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+    <para os="e">To test the results, identify the correct emulation, then 
issue:
+    <userinput>make LDEMULATION=[emulation] check</userinput>. The correct
+    emulation will be elf32btsmipn32 for a big-endian machine and 
elf32ltsmipn32
+    for a little-endian machine.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="libtool.xml"

Modified: trunk/BOOK/final-system/multilib/libtool.xml
===================================================================
--- trunk/BOOK/final-system/multilib/libtool.xml        2006-07-29 23:37:15 UTC 
(rev 2161)
+++ trunk/BOOK/final-system/multilib/libtool.xml        2006-07-29 23:37:22 UTC 
(rev 2162)
@@ -10,6 +10,10 @@
 
   <title>Libtool-&libtool-version; 32 Bit Libraries</title>
 
+<!-- with the introduction of an LDEMULATION  on make check, to fix a test
+ failure which has appeared for unknown reasons, this text is now specific
+ to mips -o32. -->
+
   <indexterm zone="ch-system-libtool-32">
     <primary sortas="a-Libtool">Libtool</primary>
     <secondary>32 Bit</secondary>
@@ -36,10 +40,43 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../common/libtool.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+    <para os="e">To test the results, first identify whether you are on a big- 
or
+    little-endian machine.  SGI machines are usually big-endian, Cobalt are
+    usually little-endian.  If in doubt you can <command>echo ${MACHTYPE} | 
grep 'el-'
+    </command>- this will match a little-endian machine.</para>
 
+    <para os="e2">To test on a little-endian machine issue:
+    <userinput>make LDEMULATION=elf32ltsmip check</userinput>.</para>
+
+    <para os="e1">To test on a big-endian machine issue:
+    <userinput>make LDEMULATION=elf32btsmip check</userinput>.</para>
+
+    <variablelist os="c">
+      <title>The meaning of the override on make check:</title>
+
+      <varlistentry>
+        <term><parameter>LDEMULATION=[emulation]</parameter></term>
+       <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+       href="../ppc64/libtool.xml"
+       xpointer="xpointer(//[EMAIL PROTECTED]'c2'])"/> -->
+        <listitem os="c2">
+          <para>Libtool tends to do the wrong thing when building for multilib,
+         at least on the non-default size(s) of architecture.  These causes of
+         these errors are not well understood and they can appear, or 
disappear,
+         as a result of apparently innocuous other changes in the build.  In
+         this version of the book, one of the tests (pdemo-make) fails to link
+         because it tries to link the 32-bit objects against 64-bit system
+         libraries. This option enables the test to succeed without impacting
+         the other tests (compare the common alternative fixes of
+         <literal>LD="gcc ${BUILD32}"</literal> which causes far fewer tests
+         to be executed, and configuring with
+         <literal>LDFLAGS='-L/lib -L/usr/lib'</literal> which in this case
+         causes other tests to fail.)</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="../common/libtool.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>

Modified: trunk/BOOK/final-system/ppc64/libtool.xml
===================================================================
--- trunk/BOOK/final-system/ppc64/libtool.xml   2006-07-29 23:37:15 UTC (rev 
2161)
+++ trunk/BOOK/final-system/ppc64/libtool.xml   2006-07-29 23:37:22 UTC (rev 
2162)
@@ -46,20 +46,9 @@
 
       <varlistentry>
         <term><parameter>LDEMULATION=elf32ppc</parameter></term>
-        <listitem os="c2">
-          <para>Libtool tends to do the wrong thing when building for multilib,
-         at least on the non-default size(s) of architecture.  These causes of
-         these errors are not well understood and they can appear, or 
disappear,
-         as a result of apparently innocuous other changes in the build.  In
-         this version of the book, one of the tests (pdemo-make) fails to link
-         because it tries to link the 32-bit objects against 64-bit system
-         libraries. This option enables the test to succeed without impacting
-         the other tests (compare the common alternative fixes of
-         <literal>LD="gcc ${BUILD32}"</literal> which causes far fewer tests
-         to be executed, and configuring with
-         <literal>LDFLAGS='-L/lib -L/usr/lib'</literal> which in this case
-         causes other tests to fail.)</para>
-        </listitem>
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+       href="../multilib/libtool.xml"
+       xpointer="xpointer(//[EMAIL PROTECTED]'c2'])"/>
       </varlistentry>
 
     </variablelist>

Modified: trunk/BOOK/final-system/sparc64/libtool.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/libtool.xml 2006-07-29 23:37:15 UTC (rev 
2161)
+++ trunk/BOOK/final-system/sparc64/libtool.xml 2006-07-29 23:37:22 UTC (rev 
2162)
@@ -47,7 +47,7 @@
       <varlistentry>
         <term><parameter>LDEMULATION=elf32_sparc</parameter></term>
        <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-       href="../ppc64/libtool.xml"
+       href="../multilib/libtool.xml"
        xpointer="xpointer(//[EMAIL PROTECTED]'c2'])"/>
       </varlistentry>
 

Modified: trunk/BOOK/final-system/x86_64/libtool.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/libtool.xml  2006-07-29 23:37:15 UTC (rev 
2161)
+++ trunk/BOOK/final-system/x86_64/libtool.xml  2006-07-29 23:37:22 UTC (rev 
2162)
@@ -47,7 +47,7 @@
       <varlistentry>
         <term><parameter>LDEMULATION=elf_i386</parameter></term>
        <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-       href="../ppc64/libtool.xml"
+       href="../multilib/libtool.xml"
        xpointer="xpointer(//[EMAIL PROTECTED]'c2'])"/>
       </varlistentry>
 

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml        2006-07-29 23:37:15 UTC 
(rev 2161)
+++ trunk/BOOK/introduction/mips64/changelog.xml        2006-07-29 23:37:22 UTC 
(rev 2162)
@@ -34,6 +34,17 @@
 -->
 
     <listitem>
+      <para>July 29, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Apply the fix for libtool 32-bit test failures to the
+         -o32 and -n32 arches. Thanks to Jeremy and Joe for explaining about
+         these and identifying the available emulations.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 24, 2006</para>
       <itemizedlist>
         <listitem>

-- 
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to