r2149 - / trunk/BOOK/final-system/mips64 trunk/BOOK/final-system/multilib trunk/BOOK/final-system/ppc64 trunk/BOOK/introduction/mips64 trunk/BOOK/introduction/ppc64 trunk/BOOK/introduction/sparc64 trunk/BOOK/introduction/x86_64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jul 24 20:45:18 PDT 2006


Author: jim
Date: 2006-07-24 21:45:13 -0600 (Mon, 24 Jul 2006)
New Revision: 2149

Modified:
   /
   trunk/BOOK/final-system/mips64/glibc.xml
   trunk/BOOK/final-system/multilib/glibc.xml
   trunk/BOOK/final-system/ppc64/glibc.xml
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/introduction/ppc64/changelog.xml
   trunk/BOOK/introduction/sparc64/changelog.xml
   trunk/BOOK/introduction/x86_64/changelog.xml
Log:
 r4920 at server (orig r2270):  ken | 2006-07-24 18:02:14 -0700
 Fix most of the tests in glibc-32 on multilib, thanks to Go Moko. Anybody with access to mips64 should consider whether this needs to be applied to N32, please.



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

Modified: trunk/BOOK/final-system/mips64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/mips64/glibc.xml	2006-07-24 11:45:09 UTC (rev 2148)
+++ trunk/BOOK/final-system/mips64/glibc.xml	2006-07-25 03:45:13 UTC (rev 2149)
@@ -103,6 +103,14 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 

Modified: trunk/BOOK/final-system/multilib/glibc.xml
===================================================================
--- trunk/BOOK/final-system/multilib/glibc.xml	2006-07-24 11:45:09 UTC (rev 2148)
+++ trunk/BOOK/final-system/multilib/glibc.xml	2006-07-25 03:45:13 UTC (rev 2149)
@@ -87,6 +87,16 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
+    <para os="l1">In multilib, we tend to think that compiling for
+    <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
+    cross-compiling. Glibc takes the traditional view that if you are building
+    for a different host then you are cross-compiling, so you won"t be running
+    the tests and therefore you don"t need the locale files. When we run
+    the tests, many will fail if the locale files are missing. The following
+    sed allows these tests to succeed:</para>
+
+<screen os="l2"><userinput>sed -i '/cross-compiling/s at ifeq@ifneq at g' ../glibc-2.4/localedata/Makefile</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
@@ -103,6 +113,8 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
+<!-- now that we can see what is really failing, we can address arch-specific failures here -->
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='q'])"/>

Modified: trunk/BOOK/final-system/ppc64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/ppc64/glibc.xml	2006-07-24 11:45:09 UTC (rev 2148)
+++ trunk/BOOK/final-system/ppc64/glibc.xml	2006-07-25 03:45:13 UTC (rev 2149)
@@ -96,6 +96,14 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2006-07-24 11:45:09 UTC (rev 2148)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2006-07-25 03:45:13 UTC (rev 2149)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 24, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix the locale failures in 32-bit glibc tests, thanks
+	  to Go Moko.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 22, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/ppc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/ppc64/changelog.xml	2006-07-24 11:45:09 UTC (rev 2148)
+++ trunk/BOOK/introduction/ppc64/changelog.xml	2006-07-25 03:45:13 UTC (rev 2149)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 24, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix the locale failures in 32-bit glibc tests, thanks
+	  to Go Moko.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 23, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/sparc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc64/changelog.xml	2006-07-24 11:45:09 UTC (rev 2148)
+++ trunk/BOOK/introduction/sparc64/changelog.xml	2006-07-25 03:45:13 UTC (rev 2149)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 24, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix the locale failures in 32-bit glibc tests, thanks
+	  to Go Moko.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 25, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/x86_64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-24 11:45:09 UTC (rev 2148)
+++ trunk/BOOK/introduction/x86_64/changelog.xml	2006-07-25 03:45:13 UTC (rev 2149)
@@ -40,6 +40,10 @@
           <para>[ken] - Add an LDEMULATION when we run the 32-bit libtool
 	  testsuite.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Fix the locale failures in 32-bit glibc tests, thanks
+	  to Go Moko.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 




More information about the cross-lfs mailing list