Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

Location:
BOOK/cross-tools/common
Files:
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/common/bc.xml

    r88ef769 r03e6a40  
    2828
    2929    <variablelist>
    30       <title>The meaning of the configure options:</title>
     30      <title>The meaning of the configure option:</title>
    3131
    3232      <varlistentry>

  • BOOK/cross-tools/common/binutils-32.xml

    r88ef769 r03e6a40  
    8383
    8484      <varlistentry os="bd4">
     85        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
     86        <listitem>
     87          <para>Tells configure to build a linker that uses ${CLFS} as its
     88          root directory for its search paths.</para>
     89        </listitem>
     90      </varlistentry>
     91
     92      <varlistentry os="bd5">
    8593        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
    8694        <listitem>
    … …  
    93101      </varlistentry>
    94102
    95       <varlistentry os="bd5">
     103      <varlistentry os="bd6">
    96104        <term><parameter>--disable-nls</parameter></term>
    97105        <listitem>
    … …  
    101109      </varlistentry>
    102110
    103       <varlistentry os="bd6">
     111      <varlistentry os="bd7">
    104112        <term><parameter>--disable-multilib</parameter></term>
    105113        <listitem>
    … …  
    113121    <para os="be">Compile the package:</para>
    114122
    115 <screen os="bf"><userinput>make configure-host
    116 make</userinput></screen>
    117 
    118     <variablelist os="bg">
    119       <title>The meaning of the make options:</title>
    120 
    121       <varlistentry os="bg1">
    122         <term><parameter>configure-host</parameter></term>
    123         <listitem>
    124           <para>This checks the host environment and makes sure all the
    125           necessary tools are available to compile Binutils.</para>
    126         </listitem>
    127       </varlistentry>
    128 
    129     </variablelist>
     123<screen os="bf"><userinput>make</userinput></screen>
    130124
    131125    <para os="bh">Install the package:</para>
    132126
    133127<screen os="bi"><userinput>make install</userinput></screen>
    134 
    135     <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
    136     <filename class="directory">/tools/include</filename> directory:</para>
    137 
    138 <screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
    139128
    140129  </sect2>

  • BOOK/cross-tools/common/binutils.xml

    r88ef769 r03e6a40  
    8383
    8484      <varlistentry os="bd4">
     85        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
     86        <listitem>
     87          <para>Tells configure to build a linker that uses ${CLFS} as its
     88          root directory for its search paths.</para>
     89        </listitem>
     90      </varlistentry>
     91
     92      <varlistentry os="bd5">
    8593        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
    8694        <listitem>
    … …  
    93101      </varlistentry>
    94102
    95       <varlistentry os="bd5">
     103      <varlistentry os="bd6">
    96104        <term><parameter>--disable-nls</parameter></term>
    97105        <listitem>
    … …  
    101109      </varlistentry>
    102110
    103       <varlistentry os="bd6">
     111      <varlistentry os="bd7">
    104112        <term><parameter>--disable-multilib</parameter></term>
    105113        <listitem>
    … …  
    109117      </varlistentry>
    110118
    111       <varlistentry os="bd7">
     119      <varlistentry os="bd8">
    112120        <term><parameter>--enable-64-bit-bfd</parameter></term>
    113121        <listitem>
    … …  
    120128    <para os="be">Compile the package:</para>
    121129
    122 <screen os="bf"><userinput>make configure-host
    123 make</userinput></screen>
    124 
    125     <variablelist os="bg">
    126       <title>The meaning of the make options:</title>
    127 
    128       <varlistentry os="bg1">
    129         <term><parameter>configure-host</parameter></term>
    130         <listitem>
    131           <para>This checks the host environment and makes sure all the
    132           necessary tools are available to compile Binutils.</para>
    133         </listitem>
    134       </varlistentry>
    135 
    136     </variablelist>
     130<screen os="bf"><userinput>make</userinput></screen>
    137131
    138132    <para os="bh">Install the package:</para>
    139133
    140134<screen os="bi"><userinput>make install</userinput></screen>
    141 
    142     <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
    143     <filename class="directory">/tools/include</filename> directory:</para>
    144 
    145 <screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
    146135
    147136  </sect2>

  • BOOK/cross-tools/common/cloog.xml

    r88ef769 r03e6a40  
    2929    --with-gmp-prefix=/cross-tools --with-isl-prefix=/cross-tools</userinput></screen>
    3030
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     32    href="../../final-system/common/cloog.xml"
     33    xpointer="xpointer(//*[@os='s1'])"/>
     34
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     36    href="../../final-system/common/cloog.xml"
     37    xpointer="xpointer(//*[@os='s2'])"/>
     38
    3139    <para os="c">Compile the package:</para>
    3240

  • BOOK/cross-tools/common/file.xml

    r88ef769 r03e6a40  
    2828
    2929    <variablelist>
    30       <title>The meaning of the configure options:</title>
    31 
    32       <varlistentry>
    33         <term><parameter>--prefix=/cross-tools</parameter></term>
    34         <listitem>
    35           <para>This tells the configure script to prepare to install the
    36           package in the <filename class="directory">/cross-tools</filename>
    37           directory.</para>
    38         </listitem>
    39       </varlistentry>
     30      <title>The meaning of the new configure option:</title>
    4031
    4132      <varlistentry>

  • BOOK/cross-tools/common/gcc-final.xml

    r88ef769 r03e6a40  
    6868  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
    6969  --with-gmp=/cross-tools --with-cloog=/cross-tools \
    70   --enable-cloog-backend=isl --with-isl=/cross-tools \
    71   --disable-isl-version-check --with-system-zlib --enable-checking=release \
     70  --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
    7271  --enable-libstdcxx-time</userinput></screen>
    7372
    … …  
    114113      </varlistentry>
    115114
     115      <varlistentry os="bg6">
     116        <term><parameter>--enable-libstdcxx-time</parameter></term>
     117        <listitem>
     118          <para>This enables link-time checks for the availability of
     119          clock_gettime clocks, and nanosleep and sched_yield functions, in the
     120          C library.</para>
     121        </listitem>
     122      </varlistentry>
     123
    116124    </variablelist>
    117125

  • BOOK/cross-tools/common/gcc-static.xml

    r88ef769 r03e6a40  
    6969  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
    7070  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
    71   --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
    72   --disable-libatomic --disable-libitm --disable-libsanitizer \
    73   --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
    74   --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
     71  --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
     72  --disable-libsanitizer --disable-libquadmath --disable-threads \
     73  --disable-multilib --disable-target-zlib --with-system-zlib \
    7574  --enable-languages=c --enable-checking=release</userinput></screen>
    7675
    7776    <variablelist os="am">
    7877      <title>The meaning of the new configure options:</title>
    79 
    80       <varlistentry>
    81         <term><parameter>--with-sysroot=${CLFS}</parameter></term>
    82         <listitem>
    83           <para>Tells GCC to consider ${CLFS} as the root file system.</para>
    84         </listitem>
    85       </varlistentry>
    8678
    8779     <varlistentry>
    … …  
    9688      </varlistentry>
    9789
    98 
    9990      <varlistentry>
    10091        <term><parameter>--with-native-system-headers-dir=/tools/include</parameter></term>
    … …  
    10798
    10899      <varlistentry>
    109         <term><parameter>--disable-nls</parameter></term>
    110         <listitem>
    111           <para>This disables internationalization as i18n is not needed for the
    112           cross-compile tools.</para>
     100        <term><parameter>--disable-shared</parameter></term>
     101        <listitem>
     102          <para>This tells GCC not to create a shared library.</para>
    113103        </listitem>
    114104      </varlistentry>
    … …  
    136126
    137127      <varlistentry>
    138         <term><parameter>--disable-libgomp</parameter></term>
    139         <listitem>
    140           <para>Disables the creation of runtime libraries used by GOMP.</para>
    141         </listitem>
    142       </varlistentry>
    143 
    144       <varlistentry>
    145         <term><parameter>--disable-libmudflap</parameter></term>
    146         <listitem>
    147           <para>Disables the creation of runtime libaries used by libmudflap.</para>
    148         </listitem>
    149       </varlistentry>
    150 
    151       <varlistentry>
    152         <term><parameter>--disable-libssp</parameter></term>
    153         <listitem>
    154           <para>Disables the use of Stack Smashing Protection for runtime libraries.</para>
     128        <term><parameter>--disable-lib*</parameter></term>
     129        <listitem>
     130          <para>These options prevent GCC from building a number of libraries
     131          that are not needed at this time.</para>
    155132        </listitem>
    156133      </varlistentry>
    … …  
    167144
    168145      <varlistentry>
    169         <term><parameter>--disable-libatomic</parameter></term>
    170         <listitem>
    171           <para>The atomic library isn't needed at this time.</para>
    172         </listitem>
    173       </varlistentry>
    174 
    175       <varlistentry>
    176         <term><parameter>--disable-libitm</parameter></term>
    177         <listitem>
    178           <para>The itm library isn't neeeded at this tiem.</para>
    179         </listitem>
    180       </varlistentry>
    181 
    182       <varlistentry>
    183         <term><parameter>--disable-libsanitizer</parameter></term>
    184         <listitem>
    185           <para>The sanitizer library isn't needed at this time.</para>
    186         </listitem>
    187       </varlistentry>
    188 
    189       <varlistentry>
    190         <term><parameter>--disable-libquadmath</parameter></term>
    191         <listitem>
    192           <para>The quadmath library isn't needed at this time.</para>
     146        <term><parameter>--disable-target-zlib</parameter></term>
     147        <listitem>
     148          <para>This tells GCC stuff.</para>
     149        </listitem>
     150      </varlistentry>
     151
     152      <varlistentry>
     153        <term><parameter>--with-system-zlib</parameter></term>
     154        <listitem>
     155          <para>This tells GCC to link to the system-installed zlib instead
     156          of the one in its source tree.</para>
    193157        </listitem>
    194158      </varlistentry>
    … …  
    231195<screen os="ar"><userinput>make install-gcc install-target-libgcc</userinput></screen>
    232196
     197    <para os="as">Copy <filename class="headerfile">libiberty.h</filename> to
     198    <filename class="directory">/tools/include</filename> directory:</para>
     199
     200<screen os="at"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /tools/include</userinput></screen>
     201
    233202  </sect2>
    234203

  • BOOK/cross-tools/common/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-cross-tools-eglibc" role="wrap">
    9   <?dbhtml filename="eglibc.html"?>
     8<sect1 id="ch-cross-tools-glibc" role="wrap">
     9  <?dbhtml filename="glibc.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version;</title>
     11  <title>GLIBC-&glibc-version;</title>
    1212
    13   <indexterm zone="ch-cross-tools-eglibc">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-cross-tools-glibc">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515    <secondary>cross tools</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/eglibc.xml"
     19  href="../../final-system/common/glibc.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of EGLIBC</title>
     23    <title>Installation of GLIBC</title>
    2424
    25     <para os="da">It should be noted that compiling EGLIBC in any way other than
     25    <para os="da">It should be noted that compiling GLIBC in any way other than
    2626    the method suggested in this book puts the stability of the system at
    2727    risk.</para>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/eglibc.xml"
     30    href="../../final-system/common/glibc.xml"
    3131    xpointer="xpointer(//*[@os='s1'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../../final-system/common/eglibc.xml"
     34    href="../../final-system/common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='s2'])"/>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../../final-system/common/eglibc.xml"
     38    href="../../final-system/common/glibc.xml"
    3939    xpointer="xpointer(//*[@os='e'])"/>
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../../final-system/common/eglibc.xml"
     42    href="../../final-system/common/glibc.xml"
    4343    xpointer="xpointer(//*[@os='f'])"/>
    4444
    4545    <para os="dd">Add the following to <filename>config.cache</filename>
    46     to disable ssp when building EGLIBC:</para>
     46    to disable ssp when building GLIBC:</para>
    4747
    4848<screen os="de"><userinput>echo "libc_cv_ssp=no" &gt; config.cache</userinput></screen>
    4949
    5050    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="../../final-system/common/eglibc.xml"
     51    href="../../final-system/common/glibc.xml"
    5252    xpointer="xpointer(//*[@os='g'])"/>
    5353
    5454<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
    5555    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
    56     ../eglibc-&eglibc-version;/configure --prefix=/tools \
     56    ../glibc-&glibc-version;/configure --prefix=/tools \
    5757    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    5858    --disable-profile --with-tls --enable-kernel=2.6.32 \
    … …  
    6767        <term><parameter>BUILD_CC="gcc"</parameter></term>
    6868        <listitem>
    69           <para>This sets EGLIBC to use the current compiler on our system. This is
    70           used to create the tools EGLIBC uses during its build.</para>
     69          <para>This sets GLIBC to use the current compiler on our system. This is
     70          used to create the tools GLIBC uses during its build.</para>
    7171        </listitem>
    7272      </varlistentry>
    … …  
    7575        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
    7676        <listitem>
    77           <para>This forces EGLIBC to use the GCC compiler that we made for our target
     77          <para>This forces GLIBC to use the GCC compiler that we made for our target
    7878          architecture.</para>
    7979        </listitem>
    … …  
    8383        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
    8484        <listitem>
    85           <para>This forces EGLIBC to use the <command>ar</command> utility
     85          <para>This forces GLIBC to use the <command>ar</command> utility
    8686          we made for our target architecture.</para>
    8787        </listitem>
    … …  
    9191        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
    9292        <listitem>
    93           <para>This forces EGLIBC to use the <command>ranlib</command> utility
     93          <para>This forces GLIBC to use the <command>ranlib</command> utility
    9494          we made for our target architecture.</para>
    9595        </listitem>
    … …  
    107107        <term><parameter>--with-tls</parameter></term>
    108108        <listitem>
    109           <para>This tells EGLIBC to use Thread Local Storage.</para>
     109          <para>This tells GLIBC to use Thread Local Storage.</para>
    110110        </listitem>
    111111      </varlistentry>
    … …  
    114114        <term><parameter>--enable-kernel=2.6.32</parameter></term>
    115115        <listitem>
    116           <para>This tells EGLIBC to compile the library with support
     116          <para>This tells GLIBC to compile the library with support
    117117          for 2.6.32 and later Linux kernels.</para>
    118118        </listitem>
    … …  
    122122        <term><parameter>--with-__thread</parameter></term>
    123123        <listitem>
    124           <para>This tells EGLIBC to use use the __thread for libc and
     124          <para>This tells GLIBC to use use the __thread for libc and
    125125          libpthread builds.</para>
    126126        </listitem>
    … …  
    130130        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
    131131        <listitem>
    132           <para>This tells EGLIBC to use the Binutils that are specific to
     132          <para>This tells GLIBC to use the Binutils that are specific to
    133133          our target architecture.</para>
    134134        </listitem>
    … …  
    138138        <term><parameter>--with-headers=/tools/include</parameter></term>
    139139        <listitem>
    140           <para>This tells EGLIBC to compile itself against the headers
     140          <para>This tells GLIBC to compile itself against the headers
    141141          recently installed to the <filename class="directory">/tools</filename>
    142142          directory, so that it knows exactly what features the kernel has
    … …  
    146146
    147147      <varlistentry os="dg11">
     148        <term><parameter>--enable-obsolete-rpc</parameter></term>
     149        <listitem>
     150          <para>This tells GLIBC to install rpc headers that are not installed
     151          by default but may be needed by other packages.</para>
     152        </listitem>
     153      </varlistentry>
     154
     155      <varlistentry os="dg12">
    148156        <term><parameter>--cache-file=config.cache</parameter></term>
    149157        <listitem>
    150           <para>This tells EGLIBC to utilize a premade cache file.</para>
     158          <para>This tells GLIBC to utilize a premade cache file.</para>
    151159        </listitem>
    152160      </varlistentry>
    … …  
    180188
    181189    <para>Details on this package are located in <xref
    182     linkend="contents-eglibc" role="."/></para>
     190    linkend="contents-glibc" role="."/></para>
    183191
    184192  </sect2>

  • BOOK/cross-tools/common/gmp.xml

    r88ef769 r03e6a40  
    4646
    4747    <variablelist os="b1">
    48       <title>The meaning of the new configure options:</title>
     48      <title>The meaning of the new configure option:</title>
    4949
    5050      <varlistentry>

  • BOOK/cross-tools/common/mpfr.xml

    r88ef769 r03e6a40  
    4949
    5050      <varlistentry>
    51         <term><parameter>--enable-shared</parameter></term>
    52         <listitem>
    53           <para>This tells <command>configure</command> to build MPFR's
    54           shared libraries.</para>
    55         </listitem>
    56       </varlistentry>
    57 
    58       <varlistentry>
    5951        <term><parameter>--with-gmp=/cross-tools</parameter></term>
    6052        <listitem>
Note: See TracChangeset for help on using the changeset viewer.