From fd40de873311d7bb504462bde4c585282625019d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 25 May 2009 17:51:22 +0000
Subject: Various edits. Update glibc to fix a make check error.

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

(limited to 'chapter06')

diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 53c97a8ca..097f1dff7 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -70,12 +70,16 @@
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
 mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
+<!--
+    This should have been fixed a long time ago.
+
     <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>
+-->
 
     <para>When running <command>make install</command>, a script called
     <filename>test-installation.pl</filename> performs a small sanity test on
@@ -97,6 +101,13 @@ unset DL</userinput></screen>
 
 <screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
 
+    <para>Fix an error in one of the make check routines.  Note that the escaped
+    newline in the second <command>sed</command> is required:</para>
+
+<screen><userinput remap="pre">sed -i s/utf8/UTF-8/ libio/tst-fgetwc.c
+sed -i '/tst-fgetws-ENV/ a\
+tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
-- 
cgit v1.2.3-54-g00ecf