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/x86/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
    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
    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="../common/eglibc.xml"
     38    href="../common/glibc.xml"
    3939    xpointer="xpointer(//*[@os='e'])"/>
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/eglibc.xml"
     42    href="../common/glibc.xml"
    4343    xpointer="xpointer(//*[@os='f'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/eglibc.xml"
     46    href="../common/glibc.xml"
    4747    xpointer="xpointer(//*[@os='dd'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/eglibc.xml"
     50    href="../common/glibc.xml"
    5151    xpointer="xpointer(//*[@os='de'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../../final-system/common/eglibc.xml"
     54    href="../../final-system/common/glibc.xml"
    5555    xpointer="xpointer(//*[@os='g'])"/>
    5656
    … …  
    5858    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
    5959    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET) -O2" \
    60     ../eglibc-&eglibc-version;/configure --prefix=/tools \
     60    ../glibc-&glibc-version;/configure --prefix=/tools \
    6161    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    6262    --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
    … …  
    6868
    6969      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70       href="../common/eglibc.xml"
     70      href="../common/glibc.xml"
    7171      xpointer="xpointer(//*[@os='dg1'])"/>
    7272
    7373      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74       href="../common/eglibc.xml"
     74      href="../common/glibc.xml"
    7575      xpointer="xpointer(//*[@os='dg2'])"/>
    7676
    7777      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    78       href="../common/eglibc.xml"
     78      href="../common/glibc.xml"
    7979      xpointer="xpointer(//*[@os='dg3'])"/>
    8080
    8181      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    82       href="../common/eglibc.xml"
     82      href="../common/glibc.xml"
    8383      xpointer="xpointer(//*[@os='dg4'])"/>
    8484
    … …  
    8787        $CLFS_TARGET)" -O2</parameter></term>
    8888        <listitem>
    89           <para>Forces EGLIBC to optimize for our target system.</para>
     89          <para>Forces GLIBC to optimize for our target system.</para>
    9090        </listitem>
    9191      </varlistentry>
    9292
    9393      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    94       href="../common/eglibc.xml"
     94      href="../common/glibc.xml"
    9595      xpointer="xpointer(//*[@os='dg5'])"/>
    9696
    9797      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    98       href="../common/eglibc.xml"
     98      href="../common/glibc.xml"
    9999      xpointer="xpointer(//*[@os='dg6'])"/>
    100100
    101101      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    102       href="../common/eglibc.xml"
     102      href="../common/glibc.xml"
    103103      xpointer="xpointer(//*[@os='dg7'])"/>
    104104
    105105      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106       href="../common/eglibc.xml"
     106      href="../common/glibc.xml"
    107107      xpointer="xpointer(//*[@os='dg8'])"/>
    108108
    109109      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110       href="../common/eglibc.xml"
     110      href="../common/glibc.xml"
    111111      xpointer="xpointer(//*[@os='dg9'])"/>
    112112
    113113      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    114       href="../common/eglibc.xml"
     114      href="../common/glibc.xml"
    115115      xpointer="xpointer(//*[@os='dg10'])"/>
    116116
    117117      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    118       href="../common/eglibc.xml"
     118      href="../common/glibc.xml"
    119119      xpointer="xpointer(//*[@os='dg11'])"/>
     120
     121      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     122      href="../common/glibc.xml"
     123      xpointer="xpointer(//*[@os='dg12'])"/>
    120124
    121125    </variablelist>
    122126
    123127    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    124     href="../common/eglibc.xml"
     128    href="../common/glibc.xml"
    125129    xpointer="xpointer(//*[@os='dh'])"/>
    126130
    127131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    128     href="../common/eglibc.xml"
     132    href="../common/glibc.xml"
    129133    xpointer="xpointer(//*[@os='di'])"/>
    130134
    131135    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    132     href="../common/eglibc.xml"
     136    href="../common/glibc.xml"
    133137    xpointer="xpointer(//*[@os='dj'])"/>
    134138
    135139    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    136     href="../common/eglibc.xml"
     140    href="../common/glibc.xml"
    137141    xpointer="xpointer(//*[@os='dk'])"/>
    138142
    139143    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    140     href="../common/eglibc.xml"
     144    href="../common/glibc.xml"
    141145    xpointer="xpointer(//*[@os='dl'])"/>
    142146
    143147    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    144     href="../common/eglibc.xml"
     148    href="../common/glibc.xml"
    145149    xpointer="xpointer(//*[@os='dm'])"/>
    146150
    147151    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    148     href="../common/eglibc.xml"
     152    href="../common/glibc.xml"
    149153    xpointer="xpointer(//*[@os='dn'])"/>
    150154
    … …  
    155159
    156160    <para>Details on this package are located in <xref
    157     linkend="contents-eglibc" role="."/></para>
     161    linkend="contents-glibc" role="."/></para>
    158162
    159163  </sect2>
Note: See TracChangeset for help on using the changeset viewer.