aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2011-10-12 21:35:47 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2011-10-12 21:35:47 +0000
commitd2f700b581e0f144da64a76759ec53fd94254b62 (patch)
tree10e6a6a4e4172e22a0a5676cd24ac2b87928cad8 /chapter05
parent18fd33b46962d5b3920363d0e6739f1f63a7f063 (diff)
Upgrade to MPFR-3.1.0. Fixes #2934.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9630 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/gcc-pass1.xml4
-rw-r--r--chapter05/gcc-pass2.xml4
-rw-r--r--chapter05/mpfr.xml4
3 files changed, 6 insertions, 6 deletions
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 5d21228ef..eeeea3224 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -77,7 +77,9 @@ cd ../gcc-build</userinput></screen>
--disable-libmudflap --disable-libssp \
--disable-libgomp --disable-libquadmath \
--disable-target-libiberty --disable-target-zlib \
- --enable-languages=c --without-ppl --without-cloog</userinput></screen>
+ --enable-languages=c --without-ppl --without-cloog \
+ --with-mpfr-include=$LFS/sources/gcc-&gcc-version;/mpfr/src \
+ --with-mpfr-lib=$LFS/sources/gcc-build/mpfr/src/.libs</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 85c1a5763..e28f05af3 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -157,7 +157,9 @@ cd ../gcc-build</userinput></screen>
--enable-__cxa_atexit --enable-languages=c,c++ \
--disable-libstdcxx-pch --disable-multilib \
--disable-bootstrap --disable-libgomp \
- --without-ppl --without-cloog</userinput></screen>
+ --without-ppl --without-cloog \
+ --with-mpfr-include=$LFS/sources/gcc-&gcc-version;/mpfr/src \
+ --with-mpfr-lib=$LFS/sources/gcc-build/mpfr/src/.libs</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>
diff --git a/chapter05/mpfr.xml b/chapter05/mpfr.xml
index fe37cae9d..004273828 100644
--- a/chapter05/mpfr.xml
+++ b/chapter05/mpfr.xml
@@ -43,10 +43,6 @@
<sect2 role="installation">
<title>Installation of MPFR</title>
- <para>Apply a patch to fix a few bugs in MPFR:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&mpfr-fixes-patch;</userinput></screen>
-
<para>Prepare MPFR for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/tools --enable-thread-safe</userinput></screen>