aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter05/gcc-pass1.xml4
-rw-r--r--chapter05/gcc-pass2.xml4
-rw-r--r--general.ent4
4 files changed, 17 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e95032c40..1d7be8ea8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>2011-10-28</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Remove hardcoded paths from GCC's MPFR-related
+ configure switches. Fixes
+ <ulink url="&lfs-ticket-root;2948">#2948</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2011-10-20</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index eeeea3224..ba92ff94e 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -78,8 +78,8 @@ cd ../gcc-build</userinput></screen>
--disable-libgomp --disable-libquadmath \
--disable-target-libiberty --disable-target-zlib \
--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>
+ --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
+ --with-mpfr-lib=$(pwd)/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 e28f05af3..b29afb6ae 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -158,8 +158,8 @@ cd ../gcc-build</userinput></screen>
--disable-libstdcxx-pch --disable-multilib \
--disable-bootstrap --disable-libgomp \
--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>
+ --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
+ --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>
diff --git a/general.ent b/general.ent
index 2a6d77e88..ebed0ba0b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20111020">
-<!ENTITY releasedate "Oct 20, 2011">
+<!ENTITY version "SVN-20111028">
+<!ENTITY releasedate "Oct 28, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->