cvs commit: LFS/BOOK/chapter06 gcc.xml

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Thu May 20 08:59:09 PDT 2004


winkie      04/05/20 09:59:09

  Modified:    BOOK     general.ent
               BOOK/chapter01 changelog.xml
               BOOK/chapter03 patches.xml
               BOOK/chapter05 gcc-pass2.xml
               BOOK/chapter06 gcc.xml
  Log:
  Point to the correct GCC patches
  
  Revision  Changes    Path
  1.23      +1 -0      LFS/BOOK/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/general.ent,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- general.ent	20 May 2004 01:47:22 -0000	1.22
  +++ general.ent	20 May 2004 15:59:08 -0000	1.23
  @@ -32,6 +32,7 @@
   <!ENTITY findutils-version "4.1.20">
   <!ENTITY flex-version "2.5.31">
   <!ENTITY gawk-version "3.1.3">
  +<!ENTITY gcc-short-version "3.4.1">
   <!ENTITY gcc-version "3.4.1-20040517">
   <!ENTITY gettext-version "0.14.1">
   <!ENTITY glibc-version "2.3.4-20040510">
  
  
  
  1.772     +3 -0      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.771
  retrieving revision 1.772
  diff -u -r1.771 -r1.772
  --- changelog.xml	20 May 2004 02:51:48 -0000	1.771
  +++ changelog.xml	20 May 2004 15:59:09 -0000	1.772
  @@ -99,6 +99,9 @@
   </itemizedlist>
   </listitem>
   
  +<listitem><para>May 20th, 2004 [winkie]: Point to the correct GCC patches.
  +</para></listitem>
  +
   <listitem><para>May 20th, 2004 [alexander]: Added Hotplug 2004_04_01.
   </para></listitem>
   
  
  
  
  1.12      +2 -2      LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- patches.xml	20 May 2004 02:51:48 -0000	1.11
  +++ patches.xml	20 May 2004 15:59:09 -0000	1.12
  @@ -52,14 +52,14 @@
   <varlistentry>
   <term>GCC No-Fixincludes Patch - 1 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;gcc-&gcc-version;-no-fixincludes-1.patch"/></para>
  +<para><ulink url="&patches-root;gcc-&gcc-short-version;-no-fixincludes-1.patch"/></para>
   </listitem>
   </varlistentry>
   
   <varlistentry>
   <term>GCC Specs Patch - 11 KB:</term>
   <listitem>
  -<para><ulink url="&patches-root;gcc-&gcc-version;-specs-1.patch"/></para>
  +<para><ulink url="&patches-root;gcc-&gcc-short-version;-specs-1.patch"/></para>
   </listitem>
   </varlistentry>
   
  
  
  
  1.32      +2 -2      LFS/BOOK/chapter05/gcc-pass2.xml
  
  Index: gcc-pass2.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gcc-pass2.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- gcc-pass2.xml	16 May 2004 00:06:08 -0000	1.31
  +++ gcc-pass2.xml	20 May 2004 15:59:09 -0000	1.32
  @@ -52,8 +52,8 @@
   
   <para>First correct a problem and make an essential adjustment:</para>
   
  -<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch
  -patch -Np1 -i ../gcc-&gcc-version;-specs-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch
  +patch -Np1 -i ../gcc-&gcc-short-version;-specs-1.patch</userinput></screen>
   
   <para>The first patch disables the GCC <quote>fixincludes</quote> script. We
   mentioned this briefly earlier, but a slightly more in-depth explanation of
  
  
  
  1.32      +1 -1      LFS/BOOK/chapter06/gcc.xml
  
  Index: gcc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/gcc.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- gcc.xml	17 May 2004 21:54:58 -0000	1.31
  +++ gcc.xml	20 May 2004 15:59:09 -0000	1.32
  @@ -44,7 +44,7 @@
   <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
   the Specs patch) also used in the previous chapter:</para>
   
  -<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.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
  
  
  



More information about the lfs-book mailing list