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/alpha/glibc-headers.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-cross-tools-eglibc-headers" role="wrap">
    9   <?dbhtml filename="eglibc-headers.html"?>
     8<sect1 id="ch-cross-tools-glibc-headers" role="wrap">
     9  <?dbhtml filename="glibc-headers.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version; Headers</title>
     11  <title>GLIBC-&glibc-version; Headers</title>
    1212
    13   <indexterm zone="ch-cross-tools-eglibc-headers">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-cross-tools-glibc-headers">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515    <secondary>cross tools, headers</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 Headers</title>
     23    <title>Installation of GLIBC Headers</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/eglibc.xml"
     26    href="../common/glibc.xml"
    2727    xpointer="xpointer(//*[@os='da'])"/>
    2828
    29     <para os="s1">EGLIBC's <filename>configure</filename> script checks the
    30     version of GCC, and will fail if it's less than 3.4. The next EGLIBC build
     29    <para os="s1">GLIBC's <filename>configure</filename> script checks the
     30    version of GCC, and will fail if it's less than 3.4. The next GLIBC build
    3131    will use the GCC that will be installed into
    3232    <filename class="directory">/cross-tools</filename> in the next step.
    33     However, in this step only the EGLIBC headers are being installed - no
     33    However, in this step only the GLIBC headers are being installed - no
    3434    compiling is taking place - so the GCC version isn't important. The
    3535    following sed removes the dependency of GCC 3.4.x:</para>
    … …  
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../../final-system/common/eglibc.xml"
     41    href="../../final-system/common/glibc.xml"
    4242    xpointer="xpointer(//*[@os='s1'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../../final-system/common/eglibc.xml"
     45    href="../../final-system/common/glibc.xml"
    4646    xpointer="xpointer(//*[@os='s2'])"/>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../../final-system/common/eglibc.xml"
     49    href="../../final-system/common/glibc.xml"
    5050    xpointer="xpointer(//*[@os='e'])"/>
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../../final-system/common/eglibc.xml"
     53    href="../../final-system/common/glibc.xml"
    5454    xpointer="xpointer(//*[@os='f'])"/>
    5555
    5656    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/eglibc.xml"
     57    href="../common/glibc.xml"
    5858    xpointer="xpointer(//*[@os='dd'])"/>
    5959
    … …  
    6868
    6969    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../../final-system/common/eglibc.xml"
     70    href="../../final-system/common/glibc.xml"
    7171    xpointer="xpointer(//*[@os='g'])"/>
    7272
    73 <screen os="s3"><userinput>CC=gcc ../eglibc-&eglibc-version;/configure --prefix=/tools \
     73<screen os="s3"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
    7474   --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    7575   --disable-sanity-checks --enable-kernel=2.6.32 \
    … …  
    8989             <term><parameter>CC=gcc</parameter></term>
    9090             <listitem>
    91                 <para>Tells EGLIBC to use the host's GCC compiler.</para>
     91                <para>Tells GLIBC to use the host's GCC compiler.</para>
    9292             </listitem>
    9393          </varlistentry>
    … …  
    128128            <term><parameter>--enable-kernel=2.6.32</parameter></term>
    129129            <listitem>
    130                <para>This tells EGLIBC to compile the library with support
     130               <para>This tells GLIBC to compile the library with support
    131131               for 2.6.32 and later Linux kernels.</para>
    132132            </listitem>
    … …  
    136136           <term><parameter>--with-headers=/tools/include</parameter></term>
    137137           <listitem>
    138               <para>This tells EGLIBC to compile itself against the headers
     138              <para>This tells GLIBC to compile itself against the headers
    139139              recently installed to the <filename class="directory">/tools</filename>
    140140              directory, so that it knows exactly what features the kernel has
    … …  
    146146           <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
    147147           <listitem>
    148               <para>This tells EGLIBC to use the Binutils for our specific target architecture.</para>
     148              <para>This tells GLIBC to use the Binutils for our specific target architecture.</para>
    149149            </listitem>
    150150       </varlistentry>
    … …  
    171171   <para os="cj">Another header is needed for NPTL:</para>
    172172
    173 <screen><userinput>cp -v ../eglibc-&eglibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
     173<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
    174174    /tools/include/bits/</userinput></screen>
    175175
    … …  
    180180
    181181    <para>Details on this package are located in <xref
    182     linkend="contents-eglibc" role="."/></para>
     182    linkend="contents-glibc" role="."/></para>
    183183
    184184  </sect2>
Note: See TracChangeset for help on using the changeset viewer.