Browse Source

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
Bruce Dubbs 16 năm trước cách đây
mục cha
commit
fd40de8733

+ 10 - 0
chapter01/changelog.xml

@@ -37,6 +37,16 @@
 
 
 -->
 -->
 
 
+    <listitem>
+      <para>2009-05-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Various edits. Update glibc to fix a
+          make check error.</para>
+        </listitem>
+       </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2009-05-24</para>
       <para>2009-05-24</para>
       <itemizedlist>
       <itemizedlist>

+ 1 - 1
chapter01/how.xml

@@ -36,7 +36,7 @@
   </note>
   </note>
 
 
   <para><xref linkend="chapter-partitioning"/> of this book describes how
   <para><xref linkend="chapter-partitioning"/> of this book describes how
-  to create a new Linux native partition and file system, the place
+  to create a new Linux native partition and file system. This is the place
   where the new LFS system will be compiled and installed. <xref
   where the new LFS system will be compiled and installed. <xref
   linkend="chapter-getting-materials"/> explains which packages and
   linkend="chapter-getting-materials"/> explains which packages and
   patches need to be downloaded to build an LFS system and how to store
   patches need to be downloaded to build an LFS system and how to store

+ 1 - 1
chapter03/patches.xml

@@ -243,6 +243,6 @@
   solve minor problems or enable functionality that is not enabled by
   solve minor problems or enable functionality that is not enabled by
   default. Feel free to peruse the patches database located at
   default. Feel free to peruse the patches database located at
   <ulink url="&lfs-root;patches/"/> and acquire any additional
   <ulink url="&lfs-root;patches/"/> and acquire any additional
-  patches to suit the system needs.</para>
+  patches to suit your system needs.</para>
 
 
 </sect1>
 </sect1>

+ 11 - 0
chapter06/glibc.xml

@@ -70,12 +70,16 @@
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
 <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>
 
 
+<!--
+    This should have been fixed a long time ago.
+
     <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite
     <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>
     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
     bug or a Glibc problem. Disable installation of this locale in order to
     avoid the problem:</para>
     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
     <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>
 <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
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
     directory in a dedicated build directory:</para>
 
 

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090524">
-<!ENTITY releasedate "May 24, 2009">
+<!ENTITY version "SVN-20090525">
+<!ENTITY releasedate "May 25, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.5">
 <!ENTITY milestone "6.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->