aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorArchaic <archaic@linuxfromscratch.org>2005-12-26 19:46:12 +0000
committerArchaic <archaic@linuxfromscratch.org>2005-12-26 19:46:12 +0000
commit94aa662138576c22deef1642b3b2b302ad075a82 (patch)
tree38766a292ed556718529449133b71b25138df9b8 /chapter05
parent5536f7440f2f4a12782e8d741cbbba5f1c3cfea8 (diff)
Reverting UTF-8 changes until everything is in place.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7236 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/gawk.xml13
-rw-r--r--chapter05/glibc.xml17
2 files changed, 8 insertions, 22 deletions
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index c017de61b..c70d6d1cd 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -31,14 +31,11 @@
<screen><userinput>./configure --prefix=/tools</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>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>Compile the package:</para>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 68fd4ce01..51d44ad24 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -27,17 +27,6 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
-<para>The glibc-libidn tarball adds support for internationalized
-(non-ASCII) domain names to Glibc. While this facility is not
-useful in this chapter, the installation commands of
-<xref linkend="chapter-building-system"/>
-glibc (wrongly) check <xref linkend="chapter-temporary-tools"/> glibc for
-this feature. Unpack the tarball from within the Glibc source
-directory in order to avoid this bogus failure:</para>
-
-<screen><userinput>tar jxf ../glibc-libidn-&glibc-version;.tar.bz2</userinput></screen>
-<!-- TODO: DIY Linux modifies the installation check script in Chapte 6 instead -->
-
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
@@ -47,7 +36,7 @@ cd ../glibc-build</userinput></screen>
<para>Next, prepare Glibc for compilation:</para>
<screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
- --disable-profile --enable-add-ons=nptl,libidn \
+ --disable-profile --enable-add-ons \
--enable-kernel=2.6.0 --with-binutils=/tools/bin \
--without-gd --with-headers=/tools/include \
--without-selinux</userinput></screen>
@@ -63,9 +52,9 @@ necessary.</para></listitem>
</varlistentry>
<varlistentry>
-<term><parameter>--enable-add-ons=nptl,libidn</parameter></term>
+<term><parameter>--enable-add-ons</parameter></term>
<listitem><para>This tells Glibc to use the NPTL add-on as its threading
-library, and adds support for non-ASCII domain names.</para></listitem>
+library.</para></listitem>
</varlistentry>
<varlistentry>