[Clfs-commits] commit: r4763 - in /trunk: BOOK/introduction/common/changelog.xml BOOK/patches.ent patches/gcc-4.3.3-branch_update-1.patch patches/gcc-4.3.3-branch_update-2.patch scripts/patch/gcc-patch.sh

[svn at cross-lfs.org]

Author: jim
Date: Mon Feb 23 06:28:15 2009
New Revision: 4763

Log:
Updated GCC Branch Update Patch to -2

Added:
    trunk/patches/gcc-4.3.3-branch_update-2.patch
Removed:
    trunk/patches/gcc-4.3.3-branch_update-1.patch
Modified:
    trunk/BOOK/introduction/common/changelog.xml
    trunk/BOOK/patches.ent
    trunk/scripts/patch/gcc-patch.sh

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Mon Feb 23 06:28:15 2009
@@ -44,6 +44,9 @@
         </listitem>
         <listitem>
           <para>[Jim] - Updated Vim Branch Update Patch to -9.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Updated GCC Branch Update Patch to -2.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Mon Feb 23 06:28:15 2009
@@ -40,9 +40,9 @@
 <!ENTITY file-fixes-patch-md5 "38568a65d5b0c049f49d0b9597c2c7fc">
 <!ENTITY file-fixes-patch-size "2 KB">
 
-<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
-<!ENTITY gcc-branch_update-patch-md5 "50f8f4c0389dc057a9fbf8cabc8897d9">
-<!ENTITY gcc-branch_update-patch-size "246 KB">
+<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-2.patch">
+<!ENTITY gcc-branch_update-patch-md5 "716d24f135b6247f12434a9965b27988">
+<!ENTITY gcc-branch_update-patch-size "302 KB">
 
 <!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
 <!ENTITY gcc-posix-patch-md5 "ccc0d5f959234bf4fed2b6fa338d6117">

Modified: trunk/scripts/patch/gcc-patch.sh
==============================================================================
--- trunk/scripts/patch/gcc-patch.sh (original)
+++ trunk/scripts/patch/gcc-patch.sh Mon Feb 23 06:28:15 2009
@@ -46,6 +46,7 @@
 # Add a custom version string
 #
 DATE_STAMP=$(cat gcc-${VERSION}/gcc/DATESTAMP)
+echo "${VERSION}" > gcc-${VERSION}/gcc/BASE-VER
 sed -i "s:PKGVERSION:\"(GCC for Cross-LFS ${VERSION}.${DATE_STAMP}) \":" gcc-${VERSION}/gcc/version.c
 
 # Cleanup
@@ -54,7 +55,7 @@
   cd ${DIRECTORY}
   REMOVE="ABOUT-NLS COPYING COPYING.LIB ChangeLog ChangeLog.tree-ssa MAINTAINERS Makefile.def
     Makefile.in Makefile.tpl README README.SCO boehm-gc/ChangeLog BUGS FAQ LAST_UPDATED
-    MD5SUMS NEWS bugs.html faq.html gcc/DEV-PHASE gcc/c-parse.c
+    MD5SUMS NEWS bugs.html faq.html gcc/BASE-VER gcc/DEV-PHASE gcc/c-parse.c
     gcc/gengtype-lex.c gcc/c-parse.y gcc/gengtype-yacc.c gcc/gengtype-yacc.h gcc/f/BUGS gcc/f/NEWS
     gcc/java/parse-scan.c gcc/java/parse.c gcc/objc/objc-parse.c gcc/objc/objc-parse.y"
   for file in ${REMOVE}; do