[Clfs-commits] commit: r4299 - in /branches/clfs-sysroot: BOOK/cross-tools/arm/glibc.xml BOOK/cross-tools/common/gcc-static.xml BOOK/materials/arm/patches.xml BOOK/patches.ent patches/glibc-2.8-nptl_lowlevellock-1.patch

[svn at cross-lfs.org]

Author: jciccone
Date: Sun Jan  4 00:54:12 2009
New Revision: 4299

Log:
Add a patch to glibc on arm that fixes a compilation error.

Added:
    branches/clfs-sysroot/patches/glibc-2.8-nptl_lowlevellock-1.patch
Modified:
    branches/clfs-sysroot/BOOK/cross-tools/arm/glibc.xml
    branches/clfs-sysroot/BOOK/cross-tools/common/gcc-static.xml
    branches/clfs-sysroot/BOOK/materials/arm/patches.xml
    branches/clfs-sysroot/BOOK/patches.ent

Modified: branches/clfs-sysroot/BOOK/cross-tools/arm/glibc.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/arm/glibc.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/arm/glibc.xml Sun Jan  4 00:54:12 2009
@@ -57,11 +57,10 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p6'])"/>
 
-<!--
-    <para os="ar1">The following patch defines RTLD_SINGLE_THREAD_P for arm.</para>
+    <para os="ar1">The following patch fixes a compilation error because of a
+    missing include:</para>
 
-<screen os="ar2"><userinput>patch -Np1 -i ../&glibc-RTLD_SINGLE_THREAD_P-patch;</userinput></screen>
--->
+<screen os="ar2"><userinput>patch -Np1 -i ../&glibc-nptl_lowlevellock-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: branches/clfs-sysroot/BOOK/cross-tools/common/gcc-static.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/common/gcc-static.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/common/gcc-static.xml Sun Jan  4 00:54:12 2009
@@ -43,10 +43,12 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
-    --with-sysroot=${CLFS} --disable-nls --disable-shared \
-    --enable-languages=c</userinput></screen>
+<screen os="ae"><userinput>AR=ar ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
+    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+    --disable-multilib --with-sysroot=${CLFS} --disable-nls \
+    --without-headers --with-newlib --disable-decimal-float \
+    --disable-libgomp --disable-libmudflap --disable-libssp \
+    --disable-shared --disable-threads --enable-languages=c</userinput></screen>
 
     <variablelist os="af">
       <title>The meaning of the configure options:</title>
@@ -79,11 +81,11 @@
 
     <para os="ag">Continue with compiling the package:</para>
 
-<screen os="ah"><userinput>make all-gcc</userinput></screen>
+<screen os="ah"><userinput>make</userinput></screen>
 
     <para os="ai">Install the package:</para>
 
-<screen os="aj"><userinput>make install-gcc</userinput></screen>
+<screen os="aj"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/clfs-sysroot/BOOK/materials/arm/patches.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/materials/arm/patches.xml (original)
+++ branches/clfs-sysroot/BOOK/materials/arm/patches.xml Sun Jan  4 00:54:12 2009
@@ -9,20 +9,20 @@
   <?dbhtml filename="patches-arm.html"?>
 
   <title>Additional Patches for ARM</title>
-<!--
+
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Glibc RTLD_SINGLE_THREAD_P Patch - <token>&glibc-RTLD_SINGLE_THREAD_P-patch-size;</token>:</term>
+      <term>Glibc NPTL Low Level Lock Patch - <token>&glibc-nptl-lowlevellock-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;&glibc-RTLD_SINGLE_THREAD_P-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-RTLD_SINGLE_THREAD_P-patch-md5;</literal></para>
+        url="&patches-root;&glibc-nptl_lowlevellock-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-nptl_lowlevellock-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
   </variablelist>
--->
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/patches.xml"
   xpointer="xpointer(//*[@os='a'])"/>

Modified: branches/clfs-sysroot/BOOK/patches.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/patches.ent (original)
+++ branches/clfs-sysroot/BOOK/patches.ent Sun Jan  4 00:54:12 2009
@@ -31,7 +31,6 @@
 <!ENTITY glibc-localedef_segfault-patch "glibc-&glibc-version;-localedef_segfault-1.patch">
 <!ENTITY glibc-localedef_segfault-patch-md5 "7f8d1687d78f18cc46db1531fb17f7fe">
 <!ENTITY glibc-localedef_segfault-patch-size "4 KB">
-
 
 <!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch">
 <!ENTITY inetutils-man_pages-patch-md5 "ceddba1a8db7f18568a3832c11a69dff">
@@ -71,11 +70,9 @@
 
 <!-- ARM Specific Patches -->
 
-<!--
-<!ENTITY glibc-RTLD_SINGLE_THREAD_P-patch "glibc-&glibc-version;-RTLD_SINGLE_THREAD_P-1.patch">
-<!ENTITY glibc-RTLD_SINGLE_THREAD_P-patch-md5 "3bb0167752997d3ccf5e2b41595bd7b3">
-<!ENTITY glibc-RTLD_SINGLE_THREAD_P-patch-size "4 KB">
--->
+<!ENTITY glibc-nptl_lowlevellock-patch "glibc-&glibc-version;-nptl_lowlevellock-1.patch">
+<!ENTITY glibc-nptl_lowlevellock-patch-md5 "0a428774cf459cf5fd23ff219390c141">
+<!ENTITY glibc-nptl-lowlevellock-patch-size "4 KB">
 
 <!-- PA-RISC Specific Patches -->