Changeset 229ed25 for BOOK/cross-tools/common/gmp.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/cross-tools/common/gmp.xml (modified) (1 diff)

BOOK/cross-tools/common/gmp.xml

@@ -33 +33 @@
 -->
 
+    <note os="n1">
+      <para>If you are building with a host which has 32-bit user-space with a
+      64-bit capable CPU, cross-tools GMP will attempt to link with 64-bit
+      libraries. Add the following variable during <command>configure</command>
+      to force GMP's ABI: <command>./configure ABI=32</command></para>
+    </note>
+
     <para os="a">Prepare GMP for compilation:</para>
 
-<screen os="b"><userinput>CPPFLAGS=-fexceptions ./configure \
-    --prefix=/cross-tools --enable-cxx</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/cross-tools --enable-cxx \
+  --disable-static</userinput></screen>
+
+    <variablelist os="b1">
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-cxx</parameter></term>
+        <listitem>
+          <para>This tells GMP to enable C++ support.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para os="c">Compile the package:</para>