From 67d4ac0d292f9dacebc1bf116cce1f3e926555f9 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Sun, 2 Mar 2014 22:55:01 +0000
Subject: [PATCH] Final merge for 7.5.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10498 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 13 +++++++++++++
 general.ent             |  4 ++--
 prologue/hostreqs.xml   | 18 +++++++++++++++++-
 prologue/standards.xml  |  4 ++--
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 15932aadc..28f416aa2 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,19 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-03-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merge LFS SVN-20140302 book.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update host system requirements to address
+          possible host installation of inconsistent libraries.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-02-18</para>
       <itemizedlist>
diff --git a/general.ent b/general.ent
index a99ebf020..648589daf 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "20140226-systemd">
-<!ENTITY releasedate     "February 26, 2014">
+<!ENTITY version         "20140302-systemd">
+<!ENTITY releasedate     "March 2, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 153f31898..0a73e0132 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -64,6 +64,16 @@
       <para><emphasis role="strong">GCC-4.1.2</emphasis> including the C++
       compiler, <command>g++</command> (Versions greater than &gcc-version; are
       not recommended as they have not been tested)</para>
+
+      <note><para>On some distributions, there have been reports that some
+      libraries used by gcc can be in an inconsistent state and that this
+      interferes with building some LFS packages.  To check this, look in
+      /usr/lib and possibly /usr/lib64 for libgmp.la, libmpfr.la, and
+      libmpc.la.  Either all three should be present or absent, but not only
+      one or two.  If the problem exists on your system, either rename or
+      delete the .la files or install the appropriate missing
+      package.</para></note>
+
     </listitem>
 
     <listitem>
@@ -184,7 +194,13 @@ echo 'main(){}' &gt; dummy.c &amp;&amp; g++ -o dummy dummy.c
 if [ -x dummy ]
   then echo "g++ compilation OK";
   else echo "g++ compilation failed"; fi
-rm -f dummy.c dummy</literal>
+rm -f dummy.c dummy
+
+for lib in lib{gmp,mpfr,mpc}.la; do
+  echo $lib: $(if find /usr/lib* -name $lib|
+               grep -q $lib;then :;else echo not;fi) found
+done
+unset lib</literal>
 EOF
 
 bash version-check.sh</userinput></screen>
diff --git a/prologue/standards.xml b/prologue/standards.xml
index cc5db1916..a4dbd2d7e 100644
--- a/prologue/standards.xml
+++ b/prologue/standards.xml
@@ -112,7 +112,7 @@
       <varlistentry>
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>At, Batch (a part of At), Cpio, Fcrontab, Initd-tools,
+          <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools,
           Lsb_release, PAM, Sendmail (or Postfix or Exim) </para>
         </listitem>
       </varlistentry>
@@ -165,7 +165,7 @@
       <varlistentry>
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>None</para>
+          <para>time (executable) and pax</para>
         </listitem>
       </varlistentry>