From 5ef820bf04515887f5aa1b41db1272b811294395 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 4 Jun 2014 18:52:33 +0000
Subject: Update to e2fsprogs-1.42.10 Update to grep-2.20 Update to perl-5.20.0
 Update to man-pages-3.68 Update to tzdata-2014d Update to check-0.9.13 Update
 to linux-3.14.5 Update to eudev-1.7

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10571 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/binutils.xml  | 3 +++
 chapter06/e2fsprogs.xml | 5 +++--
 chapter06/glibc.xml     | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 8daeb5616..dc3904c9e 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -116,6 +116,9 @@ cd ../binutils-build</userinput></screen>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>Six tests in the lto.exp testsuite are known to fail due
+    to changes in the most recent version of gcc.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 7aca00f9e..f10b8077b 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,10 +44,11 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>First fix a problem with running regression tests in the LFS chroot
+    <para>First fix some problems with running regression tests in the LFS chroot
     environment:</para>
 
-<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&e2fsprogs-fix-test-patch;
+sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index d64b81219..5ac095124 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -412,7 +412,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd, pcprofiledump,
         pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
-        <seg>ld.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
+        <seg>ld-&glibc-version;.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
         libc.{a,so}, libc_nonshared.a, libcidn.so,
         libcrypt.{a,so}, libdl.{a,so}, libg.a, libieee.a, libm.{a,so},
         libmcheck.a, libmemusage.so, libnsl.{a,so}, libnss_compat.so,
@@ -698,11 +698,11 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
       </varlistentry>
 
       <varlistentry id="ld.so">
-        <term><filename class="libraryfile">ld.so</filename></term>
+        <term><filename class="libraryfile">ld-&glibc-version;.so</filename></term>
         <listitem>
           <para>The helper program for shared library executables</para>
           <indexterm zone="ch-system-glibc ld.so">
-            <primary sortas="c-ld.so">ld.so</primary>
+            <primary sortas="c-ld.so">ld-&glibc-version;.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-- 
cgit v1.2.3-54-g00ecf