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/ppc64-64/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="../common/eglibc.xml"
     54    href="../common/glibc.xml"
    5555    xpointer="xpointer(//*[@os='g'])"/>
    5656
    5757    <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
    5858      AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
    59       ../eglibc-&eglibc-version;/configure --prefix=/tools \
     59      ../glibc-&glibc-version;/configure --prefix=/tools \
    6060      --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    6161      --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
    … …  
    6767
    6868      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    69       href="../common/eglibc.xml"
     69      href="../common/glibc.xml"
    7070      xpointer="xpointer(//*[@os='dg1'])"/>
    7171
    7272      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    73       href="../multilib/eglibc-64bit.xml"
     73      href="../multilib/glibc-64bit.xml"
    7474      xpointer="xpointer(//*[@os='fa1'])"/>
    7575
    7676      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77       href="../common/eglibc.xml"
     77      href="../common/glibc.xml"
    7878      xpointer="xpointer(//*[@os='dg3'])"/>
    7979
    8080      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81       href="../common/eglibc.xml"
     81      href="../common/glibc.xml"
    8282      xpointer="xpointer(//*[@os='dg4'])"/>
    8383
    8484      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    85       href="../common/eglibc.xml"
     85      href="../common/glibc.xml"
    8686      xpointer="xpointer(//*[@os='dg5'])"/>
    8787
    8888      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    89       href="../common/eglibc.xml"
     89      href="../common/glibc.xml"
    9090      xpointer="xpointer(//*[@os='dg6'])"/>
    9191
    9292      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    93       href="../common/eglibc.xml"
     93      href="../common/glibc.xml"
    9494      xpointer="xpointer(//*[@os='dg7'])"/>
    9595
    9696      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    97       href="../common/eglibc.xml"
     97      href="../common/glibc.xml"
    9898      xpointer="xpointer(//*[@os='dg8'])"/>
    9999
    100100      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    101       href="../common/eglibc.xml"
     101      href="../common/glibc.xml"
    102102      xpointer="xpointer(//*[@os='dg9'])"/>
    103103
    104104      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    105       href="../common/eglibc.xml"
     105      href="../common/glibc.xml"
    106106      xpointer="xpointer(//*[@os='dg10'])"/>
    107107
    108108      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109       href="../common/eglibc.xml"
     109      href="../common/glibc.xml"
    110110      xpointer="xpointer(//*[@os='dg11'])"/>
     111
     112      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     113      href="../common/glibc.xml"
     114      xpointer="xpointer(//*[@os='dg12'])"/>
    111115
    112116    </variablelist>
    113117
    114118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="../common/eglibc.xml"
     119    href="../common/glibc.xml"
    116120    xpointer="xpointer(//*[@os='dh'])"/>
    117121
    118122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119     href="../common/eglibc.xml"
     123    href="../common/glibc.xml"
    120124    xpointer="xpointer(//*[@os='di'])"/>
    121125
    122126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123     href="../common/eglibc.xml"
     127    href="../common/glibc.xml"
    124128    xpointer="xpointer(//*[@os='dj'])"/>
    125129
    126130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127     href="../common/eglibc.xml"
     131    href="../common/glibc.xml"
    128132    xpointer="xpointer(//*[@os='dk'])"/>
    129133
    130134    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    131     href="../common/eglibc.xml"
     135    href="../common/glibc.xml"
    132136    xpointer="xpointer(//*[@os='dl'])"/>
    133137
    134138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    135     href="../common/eglibc.xml"
     139    href="../common/glibc.xml"
    136140    xpointer="xpointer(//*[@os='dm'])"/>
    137141
    138142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    139     href="../common/eglibc.xml"
     143    href="../common/glibc.xml"
    140144    xpointer="xpointer(//*[@os='dn'])"/>
    141 
    142     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    143     href="../x86_64-64/eglibc.xml"
    144     xpointer="xpointer(//*[@os='do'])"/>
    145 
    146     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    147     href="../x86_64-64/eglibc.xml"
    148     xpointer="xpointer(//*[@os='dp'])"/>
    149145
    150146  </sect2>
    … …  
    154150
    155151    <para>Details on this package are located in <xref
    156     linkend="contents-eglibc" role="."/></para>
     152    linkend="contents-glibc" role="."/></para>
    157153
    158154  </sect2>
Note: See TracChangeset for help on using the changeset viewer.