aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter05/gcc-pass1.xml17
-rw-r--r--chapter05/gcc-pass2.xml3
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
6 files changed, 35 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7a5449cf1..ebe61c3e0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2010-06-22</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgrade to MPFR-3.0.0. Fixes
+ <ulink url="&lfs-ticket-root;2687">#2687</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2010-06-21</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ee0efffa7..96eb6694d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -142,9 +142,9 @@
<listitem>
<para>MPC &mpc-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>MPFR &mpfr-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Ncurses &ncurses-version;</para>
</listitem>-->
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index af589b579..c15c95fd2 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -67,7 +67,8 @@ cd ../gcc-build</userinput></screen>
--disable-nls --disable-shared --disable-multilib \
--disable-decimal-float --disable-threads \
--disable-libmudflap --disable-libssp \
- --disable-libgomp --enable-languages=c</userinput></screen>
+ --disable-libgomp --enable-languages=c \
+ --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -107,6 +108,20 @@ cd ../gcc-build</userinput></screen>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>--with-gmp-include=...</parameter></term>
+ <listitem>
+ <para>This option tells GCC where the GMP headers are located.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>--with-gmp-lib=...</parameter></term>
+ <listitem>
+ <para>This option tells GCC where the GMP library is located.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
<para>Compile GCC by running:</para>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 87d687bf9..ba9a96900 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -156,7 +156,8 @@ cd ../gcc-build</userinput></screen>
--enable-shared --enable-threads=posix \
--enable-__cxa_atexit --enable-languages=c,c++ \
--disable-libstdcxx-pch --disable-multilib \
- --disable-bootstrap</userinput></screen>
+ --disable-bootstrap \
+ --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>
diff --git a/general.ent b/general.ent
index 20ceff3a3..31005dffa 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100621">
-<!ENTITY releasedate "June 21, 2010">
+<!ENTITY version "SVN-20100622">
+<!ENTITY releasedate "June 22, 2010">
<!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.7">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 213717004..e68069f0d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -375,10 +375,10 @@
<!ENTITY mpc-ch6-du "10.5 MB testsuite included">
<!ENTITY mpc-ch6-sbu "0.3 SBU testsuite included">
-<!ENTITY mpfr-version "2.4.2">
-<!ENTITY mpfr-size "1,053 KB">
+<!ENTITY mpfr-version "3.0.0">
+<!ENTITY mpfr-size "1,112 KB">
<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.bz2">
-<!ENTITY mpfr-md5 "89e59fe665e2b3ad44a6789f40b059a0">
+<!ENTITY mpfr-md5 "f45bac3584922c8004a10060ab1a8f9f">
<!ENTITY mpfr-home "http://www.mpfr.org/">
<!ENTITY mpfr-ch5-du "27.1 MB">
<!ENTITY mpfr-ch5-sbu "1.0 SBU">