diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml index 4387eb93d..d66c92301 100644 --- a/appendixa/gcc-down.xml +++ b/appendixa/gcc-down.xml @@ -10,9 +10,6 @@ GCC No-Fixincludes Patch: GCC Specs Patch: -GCC Suppress-Libiberty Patch: - - GCC-2 (&gcc-2953-version;): diff --git a/appendixa/grub-down.xml b/appendixa/grub-down.xml index 180f7e1e8..362a0ffec 100644 --- a/appendixa/grub-down.xml +++ b/appendixa/grub-down.xml @@ -2,8 +2,5 @@ Official Download Location Grub (&grub-version;): - - -Grub Gcc33 Patch: - + diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml index 15793d546..174e0d101 100644 --- a/appendixa/man-down.xml +++ b/appendixa/man-down.xml @@ -5,11 +5,5 @@ Man 80-Columns Patch: - - -Man Manpath Patch: - - -Man Pager Patch: - + diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index bff870e61..110452434 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -30,12 +30,20 @@ Removed: gcc-3.3.1-no_fixincludes-2.patch +gcc-3.3.1-suppress-libiberty.patch +grub-0.93-gcc33-1.patch +man-1.5m2-manpath.patch +man-1.5m2-pager.patch ncurses-5.3-vsscanf.patch procps-3.1.11-locale-fix.patch -November 19th, 2003 [greg]: Chapter 6: - Setting up the +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. + +November 19th, 2003 [greg]: Chapter 5: - Setting up the environment: Reworked the Bash startup files to enforce a clean environment. Closes Bug 714. diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index c4d685839..5a1be1998 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -284,9 +284,6 @@ GCC No-Fixincludes Patch - &gcc-nofixincludes-patch-size;: GCC Specs Patch - &gcc-specs-patch-size;: -GCC Suppress-Libiberty Patch - &gcc-suppress-libiberty-patch-size;: - - GCC-2 Patch - &gcc-2953-patch-size;: @@ -299,21 +296,12 @@ GCC-2 Return-Type Patch - &gcc-2953-returntype-fix-patch-size;: Glibc Sscanf Patch - &glibc-sscanf-patch-size;: -Grub Gcc33 Patch - &grub-patch-size;: - - Kbd More-Programs Patch - &kbd-patch-size;: Man 80-Columns Patch - &man-80cols-patch-size;: -Man Manpath Patch - &man-manpath-patch-size;: - - -Man Pager Patch - &man-pager-patch-size;: - - Ncurses Etip Patch - &ncurses-etip-patch-size;: diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 899d08cab..435fc8176 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -32,7 +32,8 @@ are able to resolve the issue. You can consult the LFS Wiki at for more information on how to get PTYs working. -Unpack all three GCC tarballs (-core, -g++, and -testsuite) in one and the +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 gcc-&gcc-version;/ subdirectory. 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. -This time we will build both the C and the C++ compiler, so you'll have -to unpack the GCC-core and the GCC-g++ tarball -- they +Unpack the GCC-core and 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 . -patch -Np1 -i ../&gcc-nofixincludes-patch; -patch -Np1 -i ../&gcc-suppress-libiberty-patch; +Be careful not to apply the GCC +Specs patch from Chapter 5 here. -The second patch here suppresses the installation of libiberty from GCC, -as we will use the one provided by binutils instead. Be careful -not to apply the GCC specs patch from Chapter 5 -here. +First apply the No-Fixincludes patch that we also used in the previous +chapter: + +patch -Np1 -i ../&gcc-nofixincludes-patch; + +Now apply a sed substitution that will suppress the installation of +libiberty.a. We want to use the version of +libiberty.a provided by Binutils: + +sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory: 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. First fix a compilation problem with GCC-&gcc-version;: -patch -Np1 -i ../&grub-patch; +sed -i 's/2 long/2/' stage2/fsys_reiserfs.c Now prepare Grub for compilation: 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; Installation of Man We'll make three adjustments to the sources of Man. - -The first patch comments out the "MANPATH /usr/man" line in the -man.conf file to prevent redundant results when using - programs such as whatis: -patch -Np1 -i ../&man-manpath-patch; - -The second patch adds the -R option to the -PAGER variable so that escape sequences are -handled properly: - -patch -Np1 -i ../&man-pager-patch; - -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 -groff: +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: patch -Np1 -i ../&man-80cols-patch; +The second is a sed substitution to add the -R +switch to the PAGER variable so that escape sequences are +properly handled by Less: + +sed -i 's/-is/&R/' configure + +The third is also a sed substitution to comment out the "MANPATH +/usr/man" line in the man.conf file to prevent redundant +results when using programs such as whatis: + +sed -i 's%MANPATH./usr/man%#&%' src/man.conf.in + Now prepare Man for compilation: ./configure -default -confdir=/etc diff --git a/entities/gcc.ent b/entities/gcc.ent index 06b20b689..1dbf17572 100644 --- a/entities/gcc.ent +++ b/entities/gcc.ent @@ -24,8 +24,6 @@ - - diff --git a/entities/grub.ent b/entities/grub.ent index 5cfa265e0..42928654c 100644 --- a/entities/grub.ent +++ b/entities/grub.ent @@ -13,8 +13,5 @@ - - - diff --git a/entities/man.ent b/entities/man.ent index c5b0b6a52..ac2a59cb2 100644 --- a/entities/man.ent +++ b/entities/man.ent @@ -15,11 +15,6 @@ - - - - -