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

File:
1 moved

Legend:

Unmodified
Added
Removed

  • 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>
Note: See TracChangeset for help on using the changeset viewer.