From 1118b1757d67c5e7deb4c9e4b864b00f9d8a8b0c Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 24 May 2016 21:24:59 +0000
Subject: Create branches/merge in svn repo fo rtesting of merged LFS books

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/gcc-pass1.xml |  2 +-
 chapter05/glibc.xml     | 40 ++--------------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

(limited to 'chapter05')

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 64077a414..694bfe780 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -196,7 +196,7 @@ cd       build</userinput></screen>
 
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
-        --disable-libatomic, --disable-libgomp, --disable-libmpx
+        --disable-libatomic, --disable-libgomp, --disable-libmpx,
         --disable-libquadmath, --disable-libssp, --disable-libvtv,
         --disable-libstdcxx</parameter></term>
         <listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 53865f690..2a72325c9 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -42,11 +42,7 @@
 
   <sect2 role="installation">
     <title>Installation of Glibc</title>
-<!--
-    <para>First fix a build problem that affects i386 systems:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
--->
     <para>Fix some problems identified upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
@@ -80,15 +76,7 @@ cd       build</userinput></screen>
           cross-compiler in <filename class="directory">/tools</filename>.</para>
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry>
-        <term><parameter>- -disable-profile</parameter></term>
-        <listitem>
-          <para>This builds the libraries without profiling information. Omit
-          this option if profiling on the temporary tools is necessary.</para>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry>
         <term><parameter>--enable-kernel=&min-kernel;</parameter></term>
         <listitem>
@@ -97,16 +85,7 @@ cd       build</userinput></screen>
           kernels are not enabled.</para>
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry>
-        <term><parameter>- -enable-obsolete-rpc</parameter></term>
-        <listitem>
-          <para>This installs NIS and RPC related headers that are not
-          installed by default. They are required to build GCC and by
-          several BLFS packages.</para>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry>
         <term><parameter>--with-headers=/tools/include</parameter></term>
         <listitem>
@@ -169,21 +148,6 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-<!--
-    <para>This package does come with a test suite, however, it cannot be
-    run at this time because we do not have a C++ compiler yet.</para>
-
-    <note>
-      <para>The test suite also requires locale data to be installed in order to run
-      successfully. Locale data provides information to the system regarding
-      such things as the date, time, and currency formats accepted and output by
-      system utilities. 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. To install
-      the Glibc locales anyway, use instructions from <xref
-      linkend="ch-system-glibc" role="."/></para>
-    </note>
--->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
-- 
cgit v1.2.3-54-g00ecf