From 60bc014c77a97eb959415bc76fb66a8c6e9a4313 Mon Sep 17 00:00:00 2001
From: Dan Nichilson <dnicholson@linuxfromscratch.org>
Date: Mon, 18 Sep 2006 05:40:51 +0000
Subject: Updated to Glibc-2.4. Added a patch for iconv and removed unnecessary
 patches from glibc-2.3.6.

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

(limited to 'chapter06')

diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 0e010f9fd..cceafb0e2 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,18 +61,14 @@
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     Unpack the tarball from within the Glibc source directory:</para>
 
-<screen><userinput>tar -xf ../glibc-libidn-&glibc-version;.tar.bz2</userinput></screen>
+<screen><userinput>tar -xf ../glibc-libidn-&glibc-version;.tar.bz2
+mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
-    <para>Apply the following patch to fix build errors in packages that include
-    <filename class="headerfile">linux/types.h</filename> after <filename
-    class="headerfile">sys/kd.h</filename>:</para>
+    <para>Apply the following patch to fix an assertion failure when
+    opening two conversion descriptors with the same tocode and fromcode
+    parameters (see the iconv_open man page):</para>
 
-<screen><userinput>patch -Np1 -i ../&glibc-linux_types-patch;</userinput></screen>
-
-    <para>Add a header to define syscall functions for the inotify feature
-    available in newer Linux kernels:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-inotify-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-iconv_fix-patch;</userinput></screen>
 
     <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
@@ -172,11 +168,6 @@ grep Error glibc-check-log</userinput></screen>
 
 <screen><userinput>make install</userinput></screen>
 
-   <para>Install the inotify header to the system header location:</para>
-
-<screen><userinput>cp -v ../glibc-&glibc-version;/sysdeps/unix/sysv/linux/inotify.h \
-    /usr/include/sys</userinput></screen>
-
     <para>The locales that can make the system respond in a different language
     were not installed by the above command. None of the locales are required,
     but if some of them are missing, testsuites of the future packages would
@@ -348,8 +339,8 @@ EOF</userinput></screen>
 
       <seglistitem>
         <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
-        ldd, lddlibc4, locale, localedef, mtrace, nscd, nscd_nischeck,
-        pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
+        ldd, lddlibc4, locale, localedef, mtrace, nscd, pcprofiledump,
+        pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
         zdump, and zic</seg>
         <seg>ld.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
         libbsd-compat.a, libc.{a,so}, libcidn.so, libcrypt.{a,so}, libdl.{a,so},
@@ -502,17 +493,6 @@ EOF</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="nscd_nischeck">
-        <term><command>nscd_nischeck</command></term>
-        <listitem>
-          <para>Checks whether or not secure mode is necessary for NIS+
-          lookup</para>
-          <indexterm zone="ch-system-glibc nscd_nischeck">
-            <primary sortas="b-nscd_nischeck">nscd_nischeck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pcprofiledump">
         <term><command>pcprofiledump</command></term>
         <listitem>
-- 
cgit v1.2.3-54-g00ecf