Changeset 37e35d2 for chapter08/gmp.xml


Ignore:
Timestamp:
06/29/2020 07:55:01 AM (4 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
c4804e8
Parents:
d4fdde6
Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:
1 moved

Legend:

Unmodified
Added
Removed

  • chapter08/gmp.xml

    rd4fdde6 r37e35d2  
    3232
    3333      <seglistitem>
    34         <seg>&gmp-ch6-sbu;</seg>
    35         <seg>&gmp-ch6-du;</seg>
     34        <seg>&gmp-fin-sbu;</seg>
     35        <seg>&gmp-fin-du;</seg>
    3636      </seglistitem>
    3737    </segmentedlist>
    … …  
    121121  </sect2>
    122122
    123   <!-- ~~~~~ m32 ~~~~~ -->
     123  <!-- - - - - - - - - - -->
     124  <!-- Multilib - 32bit  -->
     125  <!-- - - - - - - - - - -->
     126
    124127  <sect2 arch="ml_32,ml_all" role="installation">
    125     <title>Installation of GMP - 32-bit</title>
     128    <title>Installation of GMP - 32bit</title>
    126129
    127130    <para>Clean previous build:</para>
    … …  
    132135    the following:</para>
    133136
    134 <screen><userinput>cp -v configfsf.guess config.guess
     137<screen><userinput remap="pre">cp -v configfsf.guess config.guess
    135138cp -v configfsf.sub   config.sub</userinput></screen>
    136139
    … …  
    138141
    139142<screen><userinput remap="configure">ABI="32" \
    140 CC="gcc -m32"  \
    141 CXX="g++ -m32" \
     143CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \
     144CXXFLAGS="$CFLAGS" \
     145PKG_CONFIG_PATH="&usr-lib-m32;/pkgconfig" \
    142146./configure             \
    143147    --prefix=/usr       \
    144148    --disable-static    \
    145149    --enable-cxx        \
    146     --libdir=/usr/lib32 \
    147     --host=i686-pc-linux-gnu</userinput></screen>
     150    --libdir=&usr-lib-m32; \
     151    --includedir=&usr-inc-m32;/gmp</userinput></screen>
     152
     153    <variablelist>
     154      <title>The meaning of the new configure options:</title>
     155
     156      <varlistentry>
     157        <term><parameter>--includedir=&usr-inc-m32;/gmp</parameter></term>
     158        <listitem>
     159          <para>Some definitions in gmp.h differs for each arch but
     160          has same name. Therefore, the headers must be separated from
     161          each other.</para>
     162        </listitem>
     163      </varlistentry>
     164
     165    </variablelist>
    148166
    149167    <para>Compile the package:</para>
    150168
    151 <screen><userinput remap="make">make</userinput></screen>
     169<screen><userinput remap="make">sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile
     170make</userinput></screen>
    152171
    153172    <important>
    … …  
    160179<screen><userinput remap="test">make check 2>&amp;1 | tee gmp-check-log</userinput></screen>
    161180 
    162     <para>Ensure that all 190 tests in the test suite passed.
     181    <para>Ensure that all 197 tests in the test suite passed.
    163182    Check the results by issuing the following command:</para>
    164183
    … …  
    168187
    169188<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    170 cp -Rv DESTDIR/usr/lib32/* /usr/lib32
     189cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     190cp -Rv DESTDIR&usr-inc-m32;/* &usr-inc-m32;/
    171191rm -rf DESTDIR</userinput></screen>
    172192
    173   </sect2>
    174  
    175   <!-- ~~~~~ mx32 ~~~~~ -->
     193  </sect2><!-- m32 -->
     194
     195  <!-- - - - - - - - - - -->
     196  <!-- Multilib - x32bit -->
     197  <!-- - - - - - - - - - -->
     198
    176199  <sect2 arch="ml_x32,ml_all" role="installation">
    177200    <title>Installation of GMP - x32-bit</title>
    … …  
    184207    the following:</para>
    185208
    186 <screen><userinput>cp -v configfsf.guess config.guess
     209<screen><userinput remap="pre">cp -v configfsf.guess config.guess
    187210cp -v configfsf.sub   config.sub</userinput></screen>
    188211
    … …  
    190213
    191214<screen><userinput remap="configure">ABI="x32" \
    192 CC="gcc -mx32"  \
    193 CXX="g++ -mx32" \
     215CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \
     216CXXFLAGS="$CFLAGS" \
     217PKG_CONFIG_PATH="&usr-lib-mx32;/pkgconfig" \
    194218./configure              \
    195219    --prefix=/usr        \
    196220    --disable-static     \
    197221    --enable-cxx         \
    198     --libdir=/usr/libx32 \
    199     --host=x86_64-pc-linux-gnux32</userinput></screen>
     222    --libdir=&usr-lib-mx32; \
     223    --includedir=&usr-inc-mx32;/gmp</userinput></screen>
    200224
    201225    <para>Compile the package:</para>
    202226
    203 <screen><userinput remap="make">make</userinput></screen>
     227<screen><userinput remap="make">sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile
     228make</userinput></screen>
    204229
    205230    <important>
    … …  
    212237<screen><userinput remap="test">make check 2>&amp;1 | tee gmp-check-log</userinput></screen>
    213238 
    214     <para>Ensure that all 190 tests in the test suite passed.
     239    <para>Ensure that all 197 tests in the test suite passed.
    215240    Check the results by issuing the following command:</para>
    216241
    … …  
    220245
    221246<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    222 cp -Rv DESTDIR/usr/libx32/* /usr/libx32
     247cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     248cp -Rv DESTDIR&usr-inc-mx32;/* &usr-inc-mx32;/
    223249rm -rf DESTDIR</userinput></screen>
    224250
    225   </sect2>
    226  
     251  </sect2><!-- mx32 -->
     252
    227253  <sect2 id="contents-gmp" role="content">
    228254    <title>Contents of GMP</title>
Note: See TracChangeset for help on using the changeset viewer.