cvs commit: LFS/BOOK/chapter05 gcc-exp.xml gcc-inst.xml

timothy at linuxfromscratch.org timothy at linuxfromscratch.org
Sun Sep 29 12:48:03 PDT 2002


timothy     02/09/29 12:48:03

  Modified:    BOOK/chapter01 changelog.xml
               BOOK/chapter03 gcc-patch.xml
               BOOK/chapter05 gcc-exp.xml gcc-inst.xml
  Log:
  Replaced nofixincludes patch (it doesn't apply cleanly) with a (more appropriate) sed command.
  
  Revision  Changes    Path
  1.387     +4 -0      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.386
  retrieving revision 1.387
  diff -u -r1.386 -r1.387
  --- changelog.xml	29 Sep 2002 00:07:31 -0000	1.386
  +++ changelog.xml	29 Sep 2002 19:48:02 -0000	1.387
  @@ -61,6 +61,10 @@
   </itemizedlist>
   </para></listitem>
   
  +<listitem><para>September 29th, 2002 [timothy]: Chapter 05 - GCC: Replaced
  +the nofixincludes patch (because it doesn't apply cleanly) with a sed
  +command.</para></listitem>
  +
   <listitem><para>September 28th, 2002 [gerard]: Chapter 05 - GCC: Added the
   nofixincludes patch to prevent that script from running in Chapter
   05. It should run in Chapter 06, so we need it to be a seperate
  
  
  
  1.9       +0 -4      LFS/BOOK/chapter03/gcc-patch.xml
  
  Index: gcc-patch.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/gcc-patch.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- gcc-patch.xml	29 Sep 2002 00:07:31 -0000	1.8
  +++ gcc-patch.xml	29 Sep 2002 19:48:02 -0000	1.9
  @@ -1,7 +1,3 @@
   GCC Patch (&gcc-patch-version;) - &gcc-patch-size;:
   <ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2"/>
   <ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2"/>
  -
  -GCC nofixincludes Patch:
  -<ulink url="&ftp;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>
  -<ulink url="&http;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>
  
  
  
  1.35      +2 -2      LFS/BOOK/chapter05/gcc-exp.xml
  
  Index: gcc-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gcc-exp.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- gcc-exp.xml	29 Sep 2002 00:07:31 -0000	1.34
  +++ gcc-exp.xml	29 Sep 2002 19:48:02 -0000	1.35
  @@ -6,8 +6,8 @@
   "var fix" documented at 
   <ulink url="http://www.zipworld.com.au/~gschafer/lfs-tweaks.html"/>.</para>
   
  -<para><userinput>patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch:</userinput>
  -This patch prevents the fixincludes script from running.</para>
  +<para><userinput>sed '/$(SHELL) .\/fixinc.sh/d':</userinput>
  +This prevents the fixincludes script from running.</para>
   
   <para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard
   codes some paths while compiling and so we need to pass /static as the
  
  
  
  1.39      +2 -1      LFS/BOOK/chapter05/gcc-inst.xml
  
  Index: gcc-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gcc-inst.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- gcc-inst.xml	29 Sep 2002 00:07:31 -0000	1.38
  +++ gcc-inst.xml	29 Sep 2002 19:48:03 -0000	1.39
  @@ -15,7 +15,8 @@
   <para>Install GCC by running the following commands:</para>
   
   <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &&
  -patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch &&
  +cp gcc/Makefile.in{,.backup} &&
  +sed '/$(SHELL) .\/fixinc.sh/d' gcc/Makefile.in.backup > gcc/Makefile.in &&
   mkdir ../gcc-build &&
   cd ../gcc-build &&
   ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list