aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Moffat <ken@linuxfromscratch.org>2010-05-24 00:41:00 +0000
committerKen Moffat <ken@linuxfromscratch.org>2010-05-24 00:41:00 +0000
commit1018fd342899e7dae021108cf697cbdd76cecf96 (patch)
tree263df423266f25e3a8352239c3ad7f5100ea022f
parent1310170ab434cb53537b7bfeaa79ae9cf239fd86 (diff)
Reword the gmp note (ABI is not part of CFLAGS, and now that we also build for x86_64 it only applies to 32-bit builds). Fixes #2648.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9287 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter06/gmp.xml13
2 files changed, 12 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f7ebf09c9..ce6fbc0cb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
<para>2010-05-23</para>
<itemizedlist>
<listitem>
+ <para>[ken] - Reword the ABI note in gmp (chapter06) to correct
+ it, and to stress that it is for 32-bit. Fixes
+ <ulink url="&lfs-ticket-root;2648">#2648</ulink></para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Add a patch to fix some internal problems
in Man-DB when viewing some pages. Thanks to William Immendorf
for posting the patch. Fixes
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml
index 522cd6710..8593e90c1 100644
--- a/chapter06/gmp.xml
+++ b/chapter06/gmp.xml
@@ -42,12 +42,13 @@
<title>Installation of GMP</title>
<note>
- <para>If you have a CPU which is capable of running 64-bit code
- and you have specified <envar>CFLAGS</envar> in the environment,
- the configure script will attempt to configure for 64-bits and fail.
- Avoid this by adding <parameter>ABI=32</parameter> to the
- <envar>CFLAGS</envar> variable for the duration of the configure
- command below, then remove it afterwards.</para>
+ <para>If you are building for 32-bit x86, but you have a CPU which is
+ capable of running 64-bit code <emphasis>and</emphasis> you have specified
+ <envar>CFLAGS</envar> in the environment, the configure script will
+ attempt to configure for 64-bits and fail.
+ Avoid this by invoking the configure command below with
+ <screen><userinput><parameter>ABI=32</parameter> ./configure ...</userinput>
+ </screen></para>
</note>
<para>Prepare GMP for compilation:</para>