From 5a25e0a586ae26a4a8c0678dac85f9626385c11d Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 5 Oct 2008 16:11:41 +0000
Subject: Updated Glibc to a 2.8 snapshot taken on 9/29/2008, the tarball of
 this snapshot includes the libidn data that previously was separately
 packaged

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8567 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/glibc.xml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 65a4383d7..192b21240 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,23 +61,23 @@
     Glibc autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
 
-    <para>The glibc-libidn tarball adds support for internationalized domain
+    <!-- <para>The glibc-libidn tarball adds support for internationalized domain
     names (IDN) to Glibc. Many programs that support IDN require the full
     <filename class="libraryfile">libidn</filename> library, not this add-on (see
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     Unpack the tarball from within the Glibc source directory:</para>
 
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
-mv glibc-libidn-&glibc-version; libidn</userinput></screen>
+mv glibc-libidn-&glibc-version; libidn</userinput></screen>-->
 
-    <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
+    <!-- <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
     at startup. It is unknown whether this is a <command>bash</command> bug or a
     Glibc problem. Disable installation of this locale in order to avoid the
     problem:</para>
 
-<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
+<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen> -->
 
-    <para>When running <command>make install</command>, a script called
+    <!-- <para>When running <command>make install</command>, a script called
     <filename>test-installation.pl</filename> performs a small sanity test on
     our newly installed Glibc. However, because our toolchain still points to
     the <filename class="directory">/tools</filename> directory, the sanity
@@ -86,7 +86,14 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
 <screen><userinput remap="pre">sed -i \
 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
-        scripts/test-installation.pl</userinput></screen>
+        scripts/test-installation.pl</userinput></screen> -->
+
+    <para>First apply two patches which correct failures in the test
+    suite:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i &glibc-iconv-test-fixes-patch; &amp;&amp;
+patch -Np1 -i &glibc-ildoubl-test-fix-patch;</userinput></screen>
+
 
     <para>The <command>ldd</command> shell script contains Bash-specific
     syntax. Change its default program interpreter to <command>/bin/bash</command>
@@ -136,9 +143,12 @@ cd ../glibc-build</userinput></screen>
       Do not skip it under any circumstance.</para>
     </important>
 
-    <para>Test the results:</para>
+    <para>Before running the tests, copy a file from the source tree into our
+    build tree to prevent a couple of test failures, then test the
+    results:</para>
 
-<screen><userinput remap="test">make -k check 2&gt;&amp;1 | tee glibc-check-log
+<screen><userinput remap="test">cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata &amp;&amp;
+make -k check 2&gt;&amp;1 | tee glibc-check-log
 grep Error glibc-check-log</userinput></screen>
 
     <para>You will probably see an expected (ignored) failure in the
@@ -230,7 +240,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
     <para>Then use the <command>localedef</command> command to create and
     install locales not listed in the
     <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file
-    in the unlikely case if you need them.</para>
+    in the unlikely case you need them.</para>
     <!-- The Live CD patches the localedata/SUPPORTED file instead of
     running localedef, the results are equivalent -->
 
-- 
cgit v1.2.3-54-g00ecf