Changeset 229ed25 for BOOK/cross-tools/common/mpfr.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/mpfr.xml (modified) (1 diff)

BOOK/cross-tools/common/mpfr.xml

@@ -23 +23 @@
     <title>Installation of MPFR</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
     <para os="a">Prepare MPFR for compilation:</para>
 
 <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
 ./configure --prefix=/cross-tools \
-    --enable-shared --with-gmp=/cross-tools</userinput></screen>
+    --disable-static --with-gmp=/cross-tools</userinput></screen>
+
+    <variablelist os="b1">
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>LDFLAGS="-Wl,-rpath,/cross-tools/lib"</parameter></term>
+        <listitem>
+          <para>This tells <command>configure</command> to search in
+          <filename class="directory">/cross-tools</filename> for libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-shared</parameter></term>
+        <listitem>
+          <para>This tells <command>configure</command> to build MPFR's
+          shared libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-gmp=/cross-tools</parameter></term>
+        <listitem>
+          <para>This tells <command>configure</command> where to find GMP.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para os="c">Compile the package:</para>