Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/sparc64/eglibc-64bit.xml

    rec008670 r229ed25  
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../common/eglibc.xml"
     46    xpointer="xpointer(//*[@os='s1'])"/>
     47
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/eglibc.xml"
     50    xpointer="xpointer(//*[@os='s2'])"/>
     51
     52    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     53    href="../common/eglibc.xml"
    4654    xpointer="xpointer(//*[@os='e'])"/>
    4755
    … …  
    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-kernel=2.6.32 \
    7280    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
    73     --cache-file=config.cache</userinput></screen>
     81    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
    7482
    7583    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.