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/sparc64/eglibc-64bit.xml

    r0cce40d r73ace20  
    3737    href="../multilib/eglibc-64bit.xml"
    3838    xpointer="xpointer(//*[@os='l4'])"/>
     39   
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41    href="../common/eglibc.xml"
     42    xpointer="xpointer(//*[@os='p3'])"/>
     43
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/eglibc.xml"
     46    xpointer="xpointer(//*[@os='p4'])"/>
    3947
    4048    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    6977<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    7078    ../eglibc-&eglibc-version;/configure --prefix=/usr \
    71     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
     79    --disable-profile --enable-add-ons --enable-kernel=2.6.32 \
    7280    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
    7381    --cache-file=config.cache</userinput></screen>
     
    113121    xpointer="xpointer(//*[@os='t'])"/>
    114122
     123    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     124    href="../common/eglibc.xml"
     125    xpointer="xpointer(//*[@os='ra'])"/>
     126
     127    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     128    href="../common/eglibc.xml"
     129    xpointer="xpointer(//*[@os='rb'])"/>
     130
    115131  </sect2>
    116132
Note: See TracChangeset for help on using the changeset viewer.