Merge pull request #95 from slhfyj93/master

10045

Author: David Gao

chapter01/changelog.xml

@@ -33,6 +33,18 @@
 
 -->
 
+    <listitem>
+        <para>2012-11-14</para>
+        <itemizedlist>
+            <listitem>
+                <para>[matthew] - 升级至 Tzdata-2012j。修复 <ulink url="&lfs-ticket-root;3227">#3227</ulink>。</para>
+            </listitem>
+            <listitem>
+                <para>[matthew] - 升级至 Binutils-2.23.1。修复 <ulink url="&lfs-ticket-root;3226">#3226</ulink>。</para>
+            </listitem>
+        </itemizedlist>
+    </listitem>
+      
     <listitem>
       <para>2012-11-13</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -36,9 +36,9 @@
     <!--<listitem>
       <para>Berkeley DB &db-version;</para>
     </listitem> -->
-    <!--<listitem>
+    <listitem>
       <para>Binutils &binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bison-&bison-version;</para>
     </listitem>
@@ -256,6 +256,10 @@
       <para>bash-4.2-fixes-8.patch</para>
     </listitem>
 
+    <listitem>
+      <para>binutils-2.22-build_fix-1.patch</para>
+    </listitem>
+      
     <listitem>
       <para>gcc-4.7.1-startfiles_fix-1.patch</para>
     </listitem>

chapter03/patches.xml

@@ -22,14 +22,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Binutils 编制修复补丁 - <token>&binutils-build-patch-size;</token>：</term>
-      <listitem>
-        <para>下载：<ulink url="&patches-root;&binutils-build-patch;"/></para>
-        <para>MD5 指纹码：<literal>&binutils-build-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Bzip2 文档补丁 - <token>&bzip2-docs-patch-size;</token>：</term>
       <listitem>

chapter05/binutils-pass1.xml

@@ -47,10 +47,6 @@
 
     <para>Binutils 作为第一个编译的程序包很重要，因为 GCC 和 Glibc 都会对汇编器和链接器进行特性测试来决定要启用还是禁用他们自己的每个特性。</para>
 
-    <para>应用一个补丁防止使用编译器优化时编制失败：</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen>
-
     <para>Binutils 文档推荐在源代码目录外创建目录编制 Binutils：</para>
 
 <screen><userinput remap="pre">mkdir -v ../binutils-build

chapter05/binutils-pass2.xml

@@ -43,10 +43,6 @@
   <sect2 role="installation">
     <title>安装 Binutils</title>
 
-    <para>应用一个补丁防止使用编译器优化时编制失败：</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen>
-
     <para>再创建一个独立的编制目录：</para>
 
 <screen><userinput remap="pre">mkdir -v ../binutils-build

chapter06/binutils.xml

@@ -58,10 +58,6 @@ Ask your system administrator to create more.</computeroutput></screen>
 <screen><userinput remap="pre">rm -fv etc/standards.info
 sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
-    <para>应用一个补丁防止在使用编译器优化时编制失败：</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen>
-
     <para>Binutils 文档推荐在源代码目录外另建目录编制 Binutils：</para>
 
 <screen><userinput remap="pre">mkdir -v ../binutils-build

general.ent

@@ -1,5 +1,5 @@
 <!ENTITY version "SVN-20121113">
-<!ENTITY releasedate "2012 年 11 月 13 日">
+<!ENTITY releasedate "2012 年 11 月 14 日">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

packages.ent

@@ -34,10 +34,10 @@
 <!ENTITY bash-ch6-du "45 MB">
 <!ENTITY bash-ch6-sbu "1.7 SBU">
 
-<!ENTITY binutils-version "2.22">
-<!ENTITY binutils-size "19,505 KB">
+<!ENTITY binutils-version "2.23.1">
+<!ENTITY binutils-size "20,953 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "ee0f10756c84979622b992a4a61ea3f5">
+<!ENTITY binutils-md5 "33adb18c3048d057ac58d07a3f1adb38">
 <!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 <!ENTITY binutils-ch5p1-du "391 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -532,10 +532,10 @@
 <!ENTITY systemd-ch6-du  "18 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
 
-<!ENTITY tzdata-version "2012i">
+<!ENTITY tzdata-version "2012j">
 <!ENTITY tzdata-size "209 KB">
 <!ENTITY tzdata-url "http://www.iana.org//time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "feea4fc19a4c55ff7550d90741e5da3f">
+<!ENTITY tzdata-md5 "ba2f92ae7ad099090e8f86cff2f2d799">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "少于 0.1 SBU">

patches.ent

@@ -6,12 +6,6 @@
 <!ENTITY bash-fixes-patch-md5 "739056302cfbb5675ceb87b29cd898e5">
 <!ENTITY bash-fixes-patch-size "54 KB">
 
-
-<!ENTITY binutils-build-patch "binutils-&binutils-version;-build_fix-1.patch">
-<!ENTITY binutils-build-patch-md5 "ddc5a9a170ed6ba23b8eb7d808e609ee">
-<!ENTITY binutils-build-patch-size "1.4 KB">
-
-
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">