Changeset 841271e in clfs-embedded for BOOK

Timestamp:

Nov 13, 2006, 10:32:29 PM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

f03c1f1

Parents:

5a8a7c0

Message:

uClibc updates

Location:

BOOK

Files:

• cross-tools/common/binutils.xml (modified) (1 diff)
• cross-tools/common/gcc-final.xml (modified) (1 diff)
• cross-tools/common/gcc-static.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (2 diffs)
• patches.ent (modified) (2 diffs)

BOOK/cross-tools/common/binutils.xml

@@ -36 +36 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
+
+    <para os="p3">Now since we using uClibc, we need to patch binutils to recognize
+    this fact:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&binutils-uclibc-patch;</userinput></screen>
 
     <para os="b">The Binutils documentation recommends building Binutils outside of the

BOOK/cross-tools/common/gcc-final.xml

@@ -41 +41 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/common/gcc-static.xml

@@ -31 +31 @@
     apply the following patch:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../gcc-4.1.1-posix-1.patch</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&gcc-posix-patch;</userinput></screen>
 
-    <para os="p3">The following patch fixes the searching of multilib dirs for
+    <para os="p3">Now since we using uClibc, we need to patch GCC to recognize
+    this fact:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&gcc-uclibc-patch;</userinput></screen>
+
+    <para os="p5">The following patch fixes the searching of multilib dirs for
     specs file.The patch standardizes the gcc drivers path iteration functions,
     ensuring multilib directories are searched in the correct order. This fixes
     various issues, most noticably with libtool on multilib systems:</para>
 
-<screen os="p4"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
+<screen os="p6"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
 
-    <para os="ac">The following patch ensures that <command>gcc</command> does not
+    <para os="p7">The following patch ensures that <command>gcc</command> does not
     search the <filename class="directory">/usr</filename> directory for
     <filename class="libraryfile">libgcc_s.so</filename> when
     cross-compiling:</para>
 
-<screen os="ad"><userinput>patch -Np1 -i ../&gcc-cross_search-patch;</userinput></screen>
+<screen os="p8"><userinput>patch -Np1 -i ../&gcc-cross_search-patch;</userinput></screen>
 
     <para os="c">The GCC documentation recommends building GCC outside of the source

BOOK/materials/common/patches.xml

@@ -25 +25 @@
         url="&patches-root;&binutils-posix-patch;"/></para>
         <para>MD5 sum: <literal>&binutils-posix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Binutils uClibc Patch - <token>&binutils-uclibc-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&binutils-uclibc-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-uclibc-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -64 +73 @@
     </varlistentry>
 
+    <varlistentry>
+      <term>GCC uClibc Patch - <token>&gcc-uclibc-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&gcc-uclibc-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-uclibc-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 

BOOK/patches.ent

@@ -8 +8 @@
 <!ENTITY binutils-posix-patch-md5 "7e42a8edc0c59246bbc58c428256113c">
 <!ENTITY binutils-posix-patch-size "4.9 KB">
+
+<!ENTITY binutils-uclibc-patch "binutils-&binutils-version;-uclibc-1.patch">
+<!ENTITY binutils-uclibc-patch-md5 "02206a199a78b14de01be6a38eb45de4">
+<!ENTITY binutils-uclibc-patch-size "12 KB">
 
 <!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
@@ -24 +28 @@
 <!ENTITY gcc-posix-patch-md5 "0d88068740a0e00780891f2cb905b808">
 <!ENTITY gcc-posix-patch-size "9 KB">
+
+<!ENTITY gcc-uclibc-patch "gcc-&gcc-version;-uclibc-1.patch">
+<!ENTITY gcc-uclibc-patch-md5 "63a7a8f1990bb333dc5513b9489845d4">
+<!ENTITY gcc-uclibc-patch-size "144 KB">
+