r765 - in trunk/BOOK: . final-system/mips64-64 final-system/sparc64 final-system/sparc64-64 final-system/x86_64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Nov 28 19:59:09 PST 2005


Author: jim
Date: 2005-11-28 20:59:09 -0700 (Mon, 28 Nov 2005)
New Revision: 765

Modified:
   trunk/BOOK/
   trunk/BOOK/final-system/mips64-64/glibc.xml
   trunk/BOOK/final-system/sparc64-64/glibc.xml
   trunk/BOOK/final-system/sparc64/glibc-64bit.xml
   trunk/BOOK/final-system/x86_64-64/glibc.xml
Log:
 r809 at server:  jim | 2005-11-28 18:36:31 -0800
 More glibc text updates



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:807
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:809
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/glibc.xml	2005-11-28 23:07:41 UTC (rev 764)
+++ trunk/BOOK/final-system/mips64-64/glibc.xml	2005-11-29 03:59:09 UTC (rev 765)
@@ -53,33 +53,26 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
-    <filename class="directory">/lib</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l1'])"/>
 
-<screen><userinput>echo "slibdir=/lib" >> configparms</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <variablelist>
-      <title>The meaning of the new configure option:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>

Modified: trunk/BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/glibc-64bit.xml	2005-11-28 23:07:41 UTC (rev 764)
+++ trunk/BOOK/final-system/sparc64/glibc-64bit.xml	2005-11-29 03:59:09 UTC (rev 765)
@@ -57,13 +57,20 @@
     href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
 
+    <para os="t1">For TLS support on the Sparc64 we will need to add the following lines to
+    <filename>config.cache</filename>:</para>
+
+<screen os="t2"><userinput>echo "libc_cv_sparc64_tls=yes" >> config.cache</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+    ../glibc-&glibc-version;/configure --prefix=/usr \
+    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/glibc-64bit.xml"

Modified: trunk/BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/glibc.xml	2005-11-28 23:07:41 UTC (rev 764)
+++ trunk/BOOK/final-system/sparc64-64/glibc.xml	2005-11-29 03:59:09 UTC (rev 765)
@@ -53,33 +53,35 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
-    <filename class="directory">/lib</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc64/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='t1'])"/>
 
-<screen><userinput>echo "slibdir=/lib" >> configparms</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc64/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
+<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib</userinput></screen>
+    --libexecdir=/usr/lib/glibc --libdir=/usr/lib
+    --cache-file=config.cache</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the new configure option:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='j'])"/>

Modified: trunk/BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/glibc.xml	2005-11-28 23:07:41 UTC (rev 764)
+++ trunk/BOOK/final-system/x86_64-64/glibc.xml	2005-11-29 03:59:09 UTC (rev 765)
@@ -45,20 +45,20 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
+    <para os="l1">Now we make sure the Glibc goes into
     <filename class="directory">/lib</filename>:</para>
 
-<screen><userinput>echo "slibdir=/lib" >> configparms</userinput></screen>
+<screen os="l2"><userinput>echo "slibdir=/lib" >> configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
+<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
     --libexecdir=/usr/lib/glibc --libdir=/usr/lib</userinput></screen>
 
-    <variablelist>
+    <variablelist os="i">
       <title>The meaning of the new configure option:</title>
 
       <varlistentry>
@@ -122,11 +122,9 @@
     not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
     is. The following <command>sed</command> will correct this.</para>
 
-    <screen><userinput>
-    rm /lib/ld-linux.so.2
+    <screen><userinput>rm /lib/ld-linux.so.2
     cp /usr/bin/ldd{,.bak}
-    sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd
-    </userinput></screen>
+    sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></screen>
 
     <para>Check the script to make sure the sed worked correctly, then delete
     the backup.</para>




More information about the cross-lfs mailing list