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/final-system/ppc64/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc-32" role="wrap">
    9   <?dbhtml filename="eglibc.html"?>
     8<sect1 id="ch-system-glibc-32" role="wrap">
     9  <?dbhtml filename="glibc.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
     11  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
    1212
    13   <indexterm zone="ch-system-eglibc-32">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-system-glibc-32">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/eglibc.xml"
     19  href="../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='z'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/eglibc.xml"
     30    href="../common/glibc.xml"
    3131    xpointer="xpointer(//*[@os='l1'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/eglibc.xml"
     34    href="../common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='l2'])"/>
    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='l3'])"/>
    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='l4'])"/>
    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='b'])"/>
    4848
    … …  
    6464
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66     href="../common/eglibc.xml"
     66    href="../common/glibc.xml"
    6767    xpointer="xpointer(//*[@os='s1'])"/>
    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='s2'])"/>
    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='e'])"/>
    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='f'])"/>
    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='g'])"/>
    8484
    8585<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    86     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     86    ../glibc-&glibc-version;/configure --prefix=/usr \
    8787    --disable-profile --enable-kernel=2.6.32 \
    88     --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
     88    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32} \
    8989    --enable-obsolete-rpc</userinput></screen>
    9090
    9191    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    92     href="../common/eglibc.xml"
     92    href="../common/glibc.xml"
    9393    xpointer="xpointer(//*[@os='i'])"/>
    9494
    9595    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    96     href="../common/eglibc.xml"
     96    href="../common/glibc.xml"
    9797    xpointer="xpointer(//*[@os='j'])"/>
    9898
    9999    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    100     href="../common/eglibc.xml"
     100    href="../common/glibc.xml"
    101101    xpointer="xpointer(//*[@os='k'])"/>
    102102
    103103    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    104     href="../common/eglibc.xml"
     104    href="../common/glibc.xml"
    105105    xpointer="xpointer(//*[@os='l'])"/>
    106106
    107107    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    108     href="../multilib/eglibc.xml"
     108    href="../multilib/glibc.xml"
    109109    xpointer="xpointer(//*[@os='l1b'])"/>
    110110
    111111    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    112     href="../multilib/eglibc.xml"
     112    href="../multilib/glibc.xml"
    113113    xpointer="xpointer(//*[@os='l2b'])"/>
    114114
    115115    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    116     href="../common/eglibc.xml"
     116    href="../common/glibc.xml"
    117117    xpointer="xpointer(//*[@os='m'])"/>
    118118
    119119    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    120     href="../common/eglibc.xml"
     120    href="../common/glibc.xml"
    121121    xpointer="xpointer(//*[@os='n'])"/>
    122122
    123123    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    124     href="../common/eglibc.xml"
     124    href="../common/glibc.xml"
    125125    xpointer="xpointer(//*[@os='o'])"/>
    126126
    127127    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    128     href="../common/eglibc.xml"
     128    href="../common/glibc.xml"
    129129    xpointer="xpointer(//*[@os='p'])"/>
    130130
    131131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    132     href="../common/eglibc.xml"
     132    href="../common/glibc.xml"
    133133    xpointer="xpointer(//*[@os='q'])"/>
    134134
    135135    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    136     href="../common/eglibc.xml"
     136    href="../common/glibc.xml"
    137137    xpointer="xpointer(//*[@os='r'])"/>
    138138
    139139    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    140     href="../common/eglibc.xml"
     140    href="../common/glibc.xml"
    141141    xpointer="xpointer(//*[@os='s'])"/>
    142142
    143143    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    144     href="../common/eglibc.xml"
     144    href="../common/glibc.xml"
    145145    xpointer="xpointer(//*[@os='t'])"/>
    146146
    … …  
    151151
    152152    <para>Details on this package are located in <xref
    153     linkend="contents-eglibc" role="."/></para>
     153    linkend="contents-glibc" role="."/></para>
    154154
    155155  </sect2>
Note: See TracChangeset for help on using the changeset viewer.