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

appendixa/gcc-down.xml

@@ -10,9 +10,6 @@ GCC No-Fixincludes Patch:
 GCC Specs Patch:
 <ulink url="&patches-root;&gcc-specs-patch;"/>
 
-GCC Suppress-Libiberty Patch:
-<ulink url="&patches-root;&gcc-suppress-libiberty-patch;"/>
-
 GCC-2 (&gcc-2953-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
 

appendixa/grub-down.xml

@@ -2,8 +2,5 @@
 <title>Official Download Location</title>
 
 <literallayout>Grub (&grub-version;):
-<ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/>
-
-Grub Gcc33 Patch:
-<ulink url="&patches-root;&grub-patch;"/></literallayout>
+<ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/></literallayout>
 </sect2>

appendixa/man-down.xml

@@ -5,11 +5,5 @@
 <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/>
 
 Man 80-Columns Patch:
-<ulink url="&patches-root;&man-80cols-patch;"/>
-
-Man Manpath Patch:
-<ulink url="&patches-root;&man-manpath-patch;"/>
-
-Man Pager Patch:
-<ulink url="&patches-root;&man-pager-patch;"/></literallayout>
+<ulink url="&patches-root;&man-80cols-patch;"/></literallayout>
 </sect2>

chapter01/changelog.xml

@@ -30,12 +30,20 @@
 <listitem><para>Removed:</para>
 <itemizedlist>
 <listitem><para>gcc-3.3.1-no_fixincludes-2.patch</para></listitem>
+<listitem><para>gcc-3.3.1-suppress-libiberty.patch</para></listitem>
+<listitem><para>grub-0.93-gcc33-1.patch</para></listitem>
+<listitem><para>man-1.5m2-manpath.patch</para></listitem>
+<listitem><para>man-1.5m2-pager.patch</para></listitem>
 <listitem><para>ncurses-5.3-vsscanf.patch</para></listitem>
 <listitem><para>procps-3.1.11-locale-fix.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
-<listitem><para>November 19th, 2003 [greg]: Chapter 6: - Setting up the
+<listitem><para>November 20th, 2003 [greg]: Rolled back the following patches
+to sed substitutions: GCC Suppress-Libiberty Patch, Grub Gcc33 Patch, Man
+Manpath Patch and Man Pager Patch. Closes Bug 461.</para></listitem>
+
+<listitem><para>November 19th, 2003 [greg]: Chapter 5: - Setting up the
 environment: Reworked the Bash startup files to enforce a clean environment.
 Closes Bug 714.</para></listitem>
 

chapter04/chapter04.xml

@@ -284,9 +284,6 @@ GCC No-Fixincludes Patch - &gcc-nofixincludes-patch-size;:
 GCC Specs Patch - &gcc-specs-patch-size;:
 <ulink url="&patches-root;&gcc-specs-patch;"/>
 
-GCC Suppress-Libiberty Patch - &gcc-suppress-libiberty-patch-size;:
-<ulink url="&patches-root;&gcc-suppress-libiberty-patch;"/>
-
 GCC-2 Patch - &gcc-2953-patch-size;:
 <ulink url="&patches-root;&gcc-2953-patch;"/>
 
@@ -299,21 +296,12 @@ GCC-2 Return-Type Patch - &gcc-2953-returntype-fix-patch-size;:
 Glibc Sscanf Patch - &glibc-sscanf-patch-size;:
 <ulink url="&patches-root;&glibc-sscanf-patch;"/>
 
-Grub Gcc33 Patch - &grub-patch-size;:
-<ulink url="&patches-root;&grub-patch;"/>
-
 Kbd More-Programs Patch - &kbd-patch-size;:
 <ulink url="&patches-root;&kbd-patch;"/>
 
 Man 80-Columns Patch - &man-80cols-patch-size;:
 <ulink url="&patches-root;&man-80cols-patch;"/>
 
-Man Manpath Patch - &man-manpath-patch-size;:
-<ulink url="&patches-root;&man-manpath-patch;"/>
-
-Man Pager Patch - &man-pager-patch-size;:
-<ulink url="&patches-root;&man-pager-patch;"/>
-
 Ncurses Etip Patch - &ncurses-etip-patch-size;:
 <ulink url="&patches-root;&ncurses-etip-patch;"/>
 

chapter05/gcc-pass2.xml

@@ -32,7 +32,8 @@ are able to resolve the issue. You can consult the LFS Wiki at
 <ulink url="http://wiki.linuxfromscratch.org/"/> for more information on how to
 get PTYs working.</para>
 
-<para>Unpack all three GCC tarballs (-core, -g++, and -testsuite) in one and the
+<para>This time we will build both the C and the C++ compilers, so you'll have
+to unpack all three GCC tarballs (-core, -g++, and -testsuite) in one and the
 same working directory. They will all unfold into a single
 <filename>gcc-&gcc-version;/</filename> subdirectory.</para>
 

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>

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>
 

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>

entities/gcc.ent

@@ -24,8 +24,6 @@
 <!ENTITY gcc-nofixincludes-patch-size "1 KB">
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
 <!ENTITY gcc-specs-patch-size "11 KB">
-<!ENTITY gcc-suppress-libiberty-patch "gcc-&gcc-version;-suppress-libiberty-1.patch">
-<!ENTITY gcc-suppress-libiberty-patch-size "1 KB">
 
 <!ENTITY gcc-compsize-tools-pass1 "300 MB">
 <!ENTITY gcc-time-tools-pass1 "4.4 SBU">

entities/grub.ent

@@ -13,8 +13,5 @@
 <!ENTITY grub-package "grub-&grub-version;.tar.gz">
 <!ENTITY grub-size "870 KB">
 
-<!ENTITY grub-patch "grub-&grub-version;-gcc33-1.patch">
-<!ENTITY grub-patch-size "1 KB">
-
 <!ENTITY grub-compsize "10 MB">
 <!ENTITY grub-time "0.2 SBU">

entities/man.ent

@@ -15,11 +15,6 @@
 
 <!ENTITY man-80cols-patch "man-&man-version;-80cols.patch">
 <!ENTITY man-80cols-patch-size "1 KB">
-<!ENTITY man-manpath-patch "man-&man-version;-manpath.patch">
-<!ENTITY man-manpath-patch-size "1 KB">
-<!ENTITY man-pager-patch "man-&man-version;-pager.patch">
-<!ENTITY man-pager-patch-size "1 KB">
-
 
 <!ENTITY man-compsize "1.9MB">
 <!ENTITY man-time "0.1 SBU">