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/x86/eglibc.xml

    r0cce40d r73ace20  
    4141    href="../common/eglibc.xml"
    4242    xpointer="xpointer(//*[@os='l4'])"/>
     43   
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/eglibc.xml"
     46    xpointer="xpointer(//*[@os='p3'])"/>
     47
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/eglibc.xml"
     50    xpointer="xpointer(//*[@os='p4'])"/>
    4351
    4452    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    6068<screen os="h"><userinput>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $MACHTYPE) \
    6169    -mtune=generic -g -O2" ../eglibc-&eglibc-version;/configure --prefix=/usr \
    62     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
     70    --disable-profile --enable-add-ons --enable-kernel=2.6.32 \
    6371    --libexecdir=/usr/lib/eglibc</userinput></screen>
    6472
     
    131139    xpointer="xpointer(//*[@os='t'])"/>
    132140
     141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     142    href="../common/eglibc.xml"
     143    xpointer="xpointer(//*[@os='ra'])"/>
     144
     145    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     146    href="../common/eglibc.xml"
     147    xpointer="xpointer(//*[@os='rb'])"/>
     148
    133149  </sect2>
    134150
Note: See TracChangeset for help on using the changeset viewer.