Changeset 1f0a9c9 in clfs-sysroot for BOOK/cross-tools

Timestamp:

May 26, 2006, 8:57:48 PM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

7126617

Parents:

8e23f7c

Message:

r3663@server (orig r1664): jciccone | 2006-05-26 17:16:29 -0700
Added glibc-ports to arm and made a few text changes

Location:

BOOK/cross-tools

Files:

• arm-chapter.xml (modified) (1 diff)
• arm/glibc-headers.xml (modified) (2 diffs)
• common/binutils.xml (modified) (1 diff)
• common/glibc.xml (modified) (10 diffs)

BOOK/cross-tools/arm-chapter.xml

@@ -19 +19 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/glibc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/cross-tools/arm/glibc-headers.xml

@@ -26 +26 @@
     the glibc we are using in cross-lfs. The reason we are changing it is
     because this only installs the headers, no compiling takes place. In the
-    next glibc chapter, we use the gcc that's build right after this chapter.</para>
+    next glibc chapter, we use the gcc that's built right after this chapter.</para>
         
 <screen os="s2"><userinput>cp configure{,.orig}
 sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='u1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='u2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -93 +101 @@
 
    <para os="n">First we will copy a common file over to <filename 
-   class="directory">/tools/include</filename>:</para>
+   class="directory">${LFS}/usr/include</filename>:</para>
 
 <screen os="o"><userinput>install -dv ${LFS}/usr/include/bits

BOOK/cross-tools/common/binutils.xml

@@ -35 +35 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \

BOOK/cross-tools/common/glibc.xml

@@ -77 +77 @@
     --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="dj">
+    <variablelist os="j">
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry os="dj1">
+      <varlistentry os="j1">
         <term><parameter>BUILD_CC="gcc"</parameter></term>
         <listitem>
@@ -88 +88 @@
       </varlistentry>
 
-      <varlistentry os="dj2">
+      <varlistentry os="j2">
         <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
         <listitem>
@@ -96 +96 @@
       </varlistentry>
 
-      <varlistentry os="dj3">
+      <varlistentry os="j3">
         <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
         <listitem>
@@ -104 +104 @@
       </varlistentry>
 
-      <varlistentry os="dj4">
+      <varlistentry os="j4">
         <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
         <listitem>
@@ -112 +112 @@
       </varlistentry>
 
-      <varlistentry os="dj5">
+      <varlistentry os="j5">
         <term><parameter>--disable-profile</parameter></term>
         <listitem>
@@ -120 +120 @@
       </varlistentry>
 
-      <varlistentry os="dj6">
+      <varlistentry os="j6">
         <term><parameter>--enable-add-ons</parameter></term>
         <listitem>
@@ -128 +128 @@
       </varlistentry>
 
-      <varlistentry os="dj7">
+      <varlistentry os="j7">
         <term><parameter>--with-tls</parameter></term>
         <listitem>
@@ -135 +135 @@
       </varlistentry>
 
-      <varlistentry os="dj8">
+      <varlistentry os="j8">
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
@@ -143 +143 @@
       </varlistentry>
 
-      <varlistentry os="dj9">
+      <varlistentry os="j9">
         <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
         <listitem>
@@ -151 +151 @@
       </varlistentry>
 
-      <varlistentry os="dj10">
+      <varlistentry os="j10">
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>