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/x86_64/glibc-64bit.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc" role="wrap">
    9   <?dbhtml filename="eglibc-64bit.html"?>
     8<sect1 id="ch-system-glibc" role="wrap">
     9  <?dbhtml filename="glibc-64bit.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version; 64-Bit</title>
     11  <title>GLIBC-&glibc-version; 64-Bit</title>
    1212
    13   <indexterm zone="ch-system-eglibc">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-system-glibc">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="eglibc.xml"
     18  href="glibc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    … …  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/eglibc.xml"
     25    href="../common/glibc.xml"
    2626    xpointer="xpointer(//*[@os='l1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/eglibc.xml"
     29    href="../common/glibc.xml"
    3030    xpointer="xpointer(//*[@os='l2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/eglibc.xml"
     33    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l3'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../multilib/eglibc-64bit.xml"
     37    href="../multilib/glibc-64bit.xml"
    3838    xpointer="xpointer(//*[@os='l4'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="eglibc.xml"
     41    href="glibc.xml"
    4242    xpointer="xpointer(//*[@os='b'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/eglibc.xml"
     45    href="../common/glibc.xml"
    4646    xpointer="xpointer(//*[@os='s1'])"/>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/eglibc.xml"
     49    href="../common/glibc.xml"
    5050    xpointer="xpointer(//*[@os='s2'])"/>
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="eglibc.xml"
     53    href="glibc.xml"
    5454    xpointer="xpointer(//*[@os='e'])"/>
    5555
    5656    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="eglibc.xml"
     57    href="glibc.xml"
    5858    xpointer="xpointer(//*[@os='f'])"/>
    5959
    6060    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../multilib/eglibc-64bit.xml"
     61    href="../multilib/glibc-64bit.xml"
    6262    xpointer="xpointer(//*[@os='m1'])"/>
    6363
    6464    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65     href="../multilib/eglibc-64bit.xml"
     65    href="../multilib/glibc-64bit.xml"
    6666    xpointer="xpointer(//*[@os='m2'])"/>
    6767
    6868    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    69     href="eglibc.xml"
     69    href="glibc.xml"
    7070    xpointer="xpointer(//*[@os='g'])"/>
    7171
    7272<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    7373    CFLAGS="-O2" \
    74     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     74    ../glibc-&glibc-version;/configure --prefix=/usr \
    7575    --disable-profile --enable-kernel=2.6.32 \
    76     --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
     76    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
    7777    --enable-obsolete-rpc</userinput></screen>
    7878
    7979    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    80     href="../multilib/eglibc-64bit.xml"
     80    href="../multilib/glibc-64bit.xml"
    8181    xpointer="xpointer(//*[@os='i'])"/>
    8282
    8383    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    84     href="eglibc.xml"
     84    href="glibc.xml"
    8585    xpointer="xpointer(//*[@os='j'])"/>
    8686
    8787    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    88     href="eglibc.xml"
     88    href="glibc.xml"
    8989    xpointer="xpointer(//*[@os='k'])"/>
    9090
    9191    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    92     href="eglibc.xml"
     92    href="glibc.xml"
    9393    xpointer="xpointer(//*[@os='l'])"/>
    9494
    9595    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    96     href="eglibc.xml"
     96    href="glibc.xml"
    9797    xpointer="xpointer(//*[@os='m'])"/>
    9898
    9999    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    100     href="eglibc.xml"
     100    href="glibc.xml"
    101101    xpointer="xpointer(//*[@os='n'])"/>
    102102
    103103    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    104     href="eglibc.xml"
     104    href="glibc.xml"
    105105    xpointer="xpointer(//*[@os='o'])"/>
    106106
    107107    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    108     href="../common/eglibc.xml"
     108    href="../common/glibc.xml"
    109109    xpointer="xpointer(//*[@os='p'])"/>
    110110
    111111    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    112     href="eglibc.xml"
     112    href="glibc.xml"
    113113    xpointer="xpointer(//*[@os='s'])"/>
    114114
    115115    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    116     href="eglibc.xml"
     116    href="glibc.xml"
    117117    xpointer="xpointer(//*[@os='t'])"/>
     118
     119    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     120    href="../common/glibc.xml"
     121    xpointer="xpointer(//*[@os='u'])"/>
     122
     123    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     124    href="../common/glibc.xml"
     125    xpointer="xpointer(//*[@os='v'])"/>
     126
     127    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     128    href="../common/glibc.xml"
     129    xpointer="xpointer(//*[@os='w'])"/>
     130
     131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     132    href="../common/glibc.xml"
     133    xpointer="xpointer(//*[@os='x'])"/>
    118134
    119135  </sect2>
    120136
    121137  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    122   href="../common/eglibc.xml"
    123   xpointer="xpointer(id('i18n-eglibc'))"/>
     138  href="../common/glibc.xml"
     139  xpointer="xpointer(id('i18n-glibc'))"/>
    124140
    125141  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    126   href="../common/eglibc.xml"
    127   xpointer="xpointer(id('conf-eglibc'))"/>
     142  href="../common/glibc.xml"
     143  xpointer="xpointer(id('conf-glibc'))"/>
    128144
    129145  <sect2 id="conf-ld" role="configuration">
    … …  
    154170
    155171    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    156     href="../multilib/eglibc-64bit.xml"
     172    href="../multilib/glibc-64bit.xml"
    157173    xpointer="xpointer(//*[@os='ld-b'])"/>
    158174
    159175    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    160     href="../multilib/eglibc-64bit.xml"
     176    href="../multilib/glibc-64bit.xml"
    161177    xpointer="xpointer(//*[@os='ld-c'])"/>
    162178
    … …  
    164180
    165181  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    166   href="../common/eglibc.xml"
    167   xpointer="xpointer(id('contents-eglibc'))"/>
     182  href="../common/glibc.xml"
     183  xpointer="xpointer(id('contents-glibc'))"/>
    168184
    169185</sect1>
Note: See TracChangeset for help on using the changeset viewer.