Changeset 026bb5d for BOOK/final-system/common/gmp.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/final-system/common/gmp.xml (modified) (3 diffs)

BOOK/final-system/common/gmp.xml

@@ -35 +35 @@
 
     <note os="n1">
-      <para>If you are compiling this package on a different CPU then you plan to
-      run the CLFS system on. You must replace GMP's <filename>config.guess</filename>
-      and <filename>config.sub</filename> wrappers with the originals. This will
-      prevent GMP from optimizing for the wrong CPU. You can make this change with
-      the following command:</para>
+      <para>If you are compiling this package on a different CPU than you plan
+      to run the CLFS system on, you must replace GMP's
+      <filename>config.guess</filename> and <filename>config.sub</filename>
+      wrappers with the originals. This will prevent GMP from optimizing for
+      the wrong CPU. You can make this change with the following command:</para>
 
-<screen><userinput>mv -v config{fsf,}.guess
-mv -v config{fsf,}.sub</userinput></screen>
+<screen>mv -v config{fsf,}.guess
+mv -v config{fsf,}.sub</screen>
 
     </note>
@@ -48 +48 @@
     <para os="a">Prepare GMP for compilation:</para>
 
-<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
+<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
 CXX="g++ -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ./configure --prefix=/usr --enable-cxx --enable-mpbsd</userinput></screen>
+  ./configure --prefix=/usr --enable-cxx</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -64 +64 @@
     <para os="f">Test the results:</para>
 
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>