Ignore:
Timestamp:
Oct 10, 2012, 6:42:21 PM (12 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f7b2c72
Parents:
0cce40d (diff), 80cbd64 (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 'master' of git.cross-lfs.org:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/ppc64/eglibc-64bit.xml

    r0cce40d r73ace20  
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4141    href="../common/eglibc.xml"
    42     xpointer="xpointer(//*[@os='p1'])"/>
     42    xpointer="xpointer(//*[@os='p3'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../common/eglibc.xml"
    46     xpointer="xpointer(//*[@os='p2'])"/>
     46    xpointer="xpointer(//*[@os='p4'])"/>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    6969<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    7070    ../eglibc-&eglibc-version;/configure --prefix=/usr \
    71     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
     71    --disable-profile --enable-add-ons --enable-kernel=2.6.32 \
    7272    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64</userinput></screen>
    7373
     
    122122    xpointer="xpointer(//*[@os='t'])"/>
    123123
     124    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     125    href="../common/eglibc.xml"
     126    xpointer="xpointer(//*[@os='ra'])"/>
     127
     128    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     129    href="../common/eglibc.xml"
     130    xpointer="xpointer(//*[@os='rb'])"/>
     131
    124132  </sect2>
    125133
Note: See TracChangeset for help on using the changeset viewer.