diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 8 | ||||
| -rw-r--r-- | chapter03/patches.xml | 4 | ||||
| -rw-r--r-- | chapter05/gcc-pass1.xml | 4 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 4 | ||||
| -rw-r--r-- | chapter06/gcc.xml | 4 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 2 |
9 files changed, 31 insertions, 15 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0c485f064..6922832f1 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,16 @@ </listitem> --> <listitem> + <para>2014-10-31</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to gcc-4.9.2. Fixes + <ulink url="&lfs-ticket-root;3702">#3702</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2014-10-30</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index a5b8dd175..5ebd85560 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -86,9 +86,9 @@ <!--<listitem> <para>Gawk &gawk-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>GCC &gcc-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>GDBM &gdbm-version;</para> </listitem>--> @@ -268,6 +268,10 @@ </listitem> <listitem> + <para>gcc-4.9.1-upstream_fixes-1.patch</para> + </listitem> + + <listitem> <para>readline-6.3-upstream_fixes-2.patch</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index de99573b6..d4d848b7a 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -83,7 +83,7 @@ </listitem> </varlistentry> --> - +<!-- <varlistentry> <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term> <listitem> @@ -91,7 +91,7 @@ <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para> </listitem> </varlistentry> - +--> <varlistentry> <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term> <listitem> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index f035784c9..58a3f770c 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -104,11 +104,11 @@ done</userinput></screen> command:</para> <screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen> - +<!-- <para>Also fix a problem identified upstream:</para> <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&\& \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen> - +--> <para>The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory:</para> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 132f54b5d..fa430f574 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -94,11 +94,11 @@ tar -xf ../gmp-&gmp-version;.tar.xz mv -v gmp-&gmp-extracted-version; gmp tar -xf ../mpc-&mpc-version;.tar.gz mv -v mpc-&mpc-version; mpc</userinput></screen> - +<!-- <para>As in the first build of GCC, fix a problem identified upstream:</para> <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&\& \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen> - +--> <para>Create a separate build directory again:</para> <screen><userinput remap="pre">mkdir -v ../gcc-build diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 24abde4fa..6c07d8ae0 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -40,7 +40,7 @@ <sect2 role="installation"> <title>Installation of GCC</title> - +<!-- <para>As in Chapter 5, fix a problem identified upstream:</para> <screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&\& \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen> @@ -50,7 +50,7 @@ programs to fail:</para> <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen> - +--> <para>The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory:</para> diff --git a/general.ent b/general.ent index 47b4528b8..6f0b2d79b 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ -<!ENTITY version "SVN-20141030"> +<!ENTITY version "SVN-20141031"> <!ENTITY short-version "svn"> <!-- Used in dbus chapter, change to x.y for release --> -<!ENTITY releasedate "October 30, 2014"> +<!ENTITY releasedate "October 31, 2014"> <!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.7"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index 27f243667..15c2bb8b6 100644 --- a/packages.ent +++ b/packages.ent @@ -200,10 +200,10 @@ <!ENTITY gawk-ch6-du "34 MB"> <!ENTITY gawk-ch6-sbu "0.3 SBU"> -<!ENTITY gcc-version "4.9.1"> -<!ENTITY gcc-size "87,749 KB"> +<!ENTITY gcc-version "4.9.2"> +<!ENTITY gcc-size "87,832 KB"> <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2"> -<!ENTITY gcc-md5 "fddf71348546af523353bd43d34919c1"> +<!ENTITY gcc-md5 "4df8ee253b7f3863ad0b86359cd39c43"> <!ENTITY gcc-home "http://gcc.gnu.org/"> <!ENTITY gcc-ch5p1-du "2.0 GB"> <!ENTITY gcc-ch5p1-sbu "7.4 SBU"> diff --git a/patches.ent b/patches.ent index b7c6005be..1412e2a61 100644 --- a/patches.ent +++ b/patches.ent @@ -37,9 +37,11 @@ <!ENTITY e2fsprogs-fix-test-patch-size "0.7 KB"> --> +<!-- <!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch"> <!ENTITY gcc-upstream-patch-md5 "015e026dff5052cd65906ee0bb8f25e8"> <!ENTITY gcc-upstream-patch-size "8.6 KB"> +--> <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch"> <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2"> |