[Clfs-commits] commit: r3885 - in /trunk: BOOK/cross-tools/x86/glibc.xml BOOK/final-system/x86/glibc.xml BOOK/materials/x86/patches.xml BOOK/patches.ent patches/glibc-2.7-i586_chk-1.patch

[svn at cross-lfs.org]

Author: jciccone
Date: Wed Jan 23 01:54:00 2008
New Revision: 3885

Log:
Add a patch that fixes builds on i586.

Added:
    trunk/patches/glibc-2.7-i586_chk-1.patch
Modified:
    trunk/BOOK/cross-tools/x86/glibc.xml
    trunk/BOOK/final-system/x86/glibc.xml
    trunk/BOOK/materials/x86/patches.xml
    trunk/BOOK/patches.ent

Modified: trunk/BOOK/cross-tools/x86/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/x86/glibc.xml (original)
+++ trunk/BOOK/cross-tools/x86/glibc.xml Wed Jan 23 01:54:00 2008
@@ -41,6 +41,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='ap1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='ap2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/x86/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/x86/glibc.xml (original)
+++ trunk/BOOK/final-system/x86/glibc.xml Wed Jan 23 01:54:00 2008
@@ -36,6 +36,11 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="ap1">The following patch ensures that memcpy_chk, mempcpy_chk,
+    and memset_chk are defined for i586.</para>
+
+    <screen os="ap2"><userinput>patch -Np1 -i ../&glibc-i586_chk-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/materials/x86/patches.xml
==============================================================================
--- trunk/BOOK/materials/x86/patches.xml (original)
+++ trunk/BOOK/materials/x86/patches.xml Wed Jan 23 01:54:00 2008
@@ -21,6 +21,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry os="glibc-i586_chk-patch">
+      <term>Glibc i586 memcpy, mempcpy, memset Patch - <token>&glibc-i586_chk-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&glibc-i586_chk-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-i586_chk-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry os="grub-fixes-patch">
       <term>Grub Various Fixes - <token>&grub-fixes-patch-size;</token>:</term>
       <listitem>

Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Wed Jan 23 01:54:00 2008
@@ -212,6 +212,12 @@
 <!ENTITY silo-fixes-patch-md5 "c65334fd6b3b99d824c458d0a3eac9b1">
 <!ENTITY silo-fixes-patch-size "668 KB">
 
+<!-- Start of x86 patches -->
+
+<!ENTITY glibc-i586_chk-patch "glibc-&glibc-version;-i586_chk-1.patch">
+<!ENTITY glibc-i586_chk-patch-md5 "b0aa1748731c459bab1ac1efbb0ec7ef">
+<!ENTITY glibc-i586_chk-patch-size "4 KB">
+
 <!-- Start of x86/x86_64 patches -->
 
 <!ENTITY bin86-x86_64-patch "bin86-&bin86-version;-x86_64-1.patch">