Rolled back 4 patches to seds: GCC Suppress-Libiberty, Grub Gcc33, Man Manpath, Man Pager. Closes Bug 461.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3117 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 27 insertions, 22 deletions

diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 54a105db1..2c68102dd 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -23,20 +23,25 @@ Therefore, if you have defined any environment variables that override
 default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
 or modifying them when building GCC.</para>
 
-<para>This time we will build both the C and the C++ compiler, so you'll have
-to unpack the GCC-core <emphasis>and</emphasis> the GCC-g++ tarball -- they
+<para>Unpack the GCC-core <emphasis>and</emphasis> the GCC-g++ tarball -- they
 will unfold into the same directory. You should likewise extract the
 GCC-testsuite package. The full GCC package contains even more
 compilers. Instructions for building these can be found at
 <ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
 
-<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
-patch -Np1 -i ../&gcc-suppress-libiberty-patch;</userinput></screen>
+<note><para>Be careful <emphasis role="strong">not</emphasis> to apply the GCC
+Specs patch from Chapter 5 here.</para></note>
 
-<para>The second patch here suppresses the installation of libiberty from GCC,
-as we will use the one provided by binutils instead. Be careful
-<emphasis>not</emphasis> to apply the GCC specs patch from Chapter 5
-here.</para>
+<para>First apply the No-Fixincludes patch that we also used in the previous
+chapter:</para>
+
+<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;</userinput></screen>
+
+<para>Now apply a sed substitution that will suppress the installation of
+<filename>libiberty.a</filename>. We want to use the version of
+<filename>libiberty.a</filename> provided by Binutils:</para>
+
+<screen><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
 
 <para>The GCC documentation recommends building GCC outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 929e2310b..29bf07713 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -21,7 +21,7 @@ Grub.</para>
 
 <para>First fix a compilation problem with GCC-&gcc-version;:</para>
 
-<screen><userinput>patch -Np1 -i ../&grub-patch;</userinput></screen>
+<screen><userinput>sed -i 's/2 long/2/' stage2/fsys_reiserfs.c</userinput></screen>
 
 <para>Now prepare Grub for compilation:</para>
 
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 833ff0e8e..96fd3c77e 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -14,25 +14,25 @@ Estimated required disk space:  &man-compsize;</screen>
 <title>Installation of Man</title>
 
 <para>We'll make three adjustments to the sources of Man.</para>
- 
-<para>The first patch comments out the "MANPATH /usr/man" line in the
-<filename>man.conf</filename> file to prevent redundant results when using
- programs such as <userinput>whatis</userinput>:</para>
 
-<screen><userinput>patch -Np1 -i ../&man-manpath-patch;</userinput></screen>
+<para>The first is a patch which allows Man to work better with recent releases
+of Groff. In particular, man pages will now display using the full terminal
+width instead of being limited to 80 characters:</para>
 
-<para>The second patch adds the <emphasis>-R</emphasis> option to the
-<emphasis>PAGER</emphasis> variable so that escape sequences are
-handled properly:</para>
+<screen><userinput>patch -Np1 -i ../&man-80cols-patch;</userinput></screen>
 
-<screen><userinput>patch -Np1 -i ../&man-pager-patch;</userinput></screen>
+<para>The second is a sed substitution to add the <emphasis>-R</emphasis>
+switch to the <emphasis>PAGER</emphasis> variable so that escape sequences are
+properly handled by Less:</para>
 
-<para>The third and last patch prevents a problem when man pages not formatted
-with more than 80 columns are used in conjunction with recent releases of
-<userinput>groff</userinput>:</para>
+<screen><userinput>sed -i 's/-is/&amp;R/' configure</userinput></screen>
 
-<screen><userinput>patch -Np1 -i ../&man-80cols-patch;</userinput></screen>
+<para>The third is also a sed substitution to comment out the "MANPATH
+/usr/man" line in the <filename>man.conf</filename> file to prevent redundant
+results when using programs such as <userinput>whatis</userinput>:</para>
 
+<screen><userinput>sed -i 's%MANPATH./usr/man%#&%' src/man.conf.in</userinput></screen>
+ 
 <para>Now prepare Man for compilation:</para>
 
 <screen><userinput>./configure -default -confdir=/etc</userinput></screen>