Initial support of UTF-8. Thanks Alexander Patrakov.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7245 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 12 insertions, 38 deletions

diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index c70d6d1cd..cca7101fc 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -31,11 +31,14 @@
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>The configure script doesn't detect some functionality correctly.  The
-following commands correct this problem:</para>
-
-<screen><userinput>echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
-echo "#define HAVE_LC_MESSAGES 1" >> config.h</userinput></screen>
+<para>Due to a bug in the <command>configure</command> script, Gawk fails
+to detect certain aspects of locale support in Glibc. This
+bug leads to, e.g., Gettext testsuite failures. Work around this issue
+by appending the missing macro definitions to <filename>config.h</filename>:</para>
+<screen><userinput>cat &gt;&gt;config.h &lt;&lt;"EOF"
+<literal>#define HAVE_LANGINFO_CODESET 1
+#define HAVE_LC_MESSAGES 1</literal>
+EOF</userinput></screen>
 
 <para>Compile the package:</para>
 
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 51d44ad24..cf6a2ee34 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -88,7 +88,7 @@ kernel has and can optimize itself accordingly.</para></listitem>
 <varlistentry>
 <term><parameter>--without-selinux</parameter></term>
 <listitem><para>When building from hosts that include SELinux functionality
-(e.g. Fedora Core 3), Glibc will build with support for SELinux. As the LFS
+(e.g., Fedora Core 3), Glibc will build with support for SELinux. As the LFS
 tools environment does not contain support for SELinux, a Glibc compiled with
 such support will fail to operate correctly.</para></listitem>
 </varlistentry>
@@ -158,38 +158,9 @@ programs works by locale.</para>
 <note><para>If the test suites are not being run in this chapter (as
 per the recommendation), there is no need to install the locales now.
 The appropriate locales will be installed in the next
-chapter.</para></note>
-
-<para>To install the Glibc locales anyway, use the following
-command:</para>
-
-<screen role="nodump"><userinput>make localedata/install-locales</userinput></screen>
-
-<para>To save time, an alternative to running the
-previous command (which generates and installs every locale Glibc is
-aware of) is to install only those locales that are wanted and needed.
-This can be achieved by using the <command>localedef</command>
-command. Information on this command is located in the
-<filename>INSTALL</filename> file in the Glibc source.  However, there
-are a number of locales that are essential in order for the tests of
-future packages to pass, in particular, the
-<emphasis>libstdc++</emphasis> tests from GCC. The following
-instructions, instead of the <parameter>install-locales</parameter>
-target used above, will install the minimum set of locales necessary
-for the tests to run successfully:</para>
-
-<screen><userinput>mkdir -pv /tools/lib/locale
-localedef -i de_DE -f ISO-8859-1 de_DE
-localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
-localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH
-localedef -i en_US -f ISO-8859-1 en_US
-localedef -i es_MX -f ISO-8859-1 es_MX
-localedef -i fa_IR -f UTF-8 fa_IR
-localedef -i fr_FR -f ISO-8859-1 fr_FR
-localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-localedef -i it_IT -f ISO-8859-1 it_IT
-localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
+chapter. To install the Glibc locales anyway, use instructions from
+<xref linkend="ch-system-glibc" role="."/>
+</para></note>
 
 </sect2>