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/cross-tools/ppc/gcc-static.xml

    rec008670 r229ed25  
    2525
    2626    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    27     href="../common/gcc-static.xml"
     27    href="../../final-system/common/gcc.xml"
    2828    xpointer="xpointer(//*[@os='p1'])"/>
    2929
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    31     href="../common/gcc-static.xml"
     31    href="../../final-system/common/gcc.xml"
    3232    xpointer="xpointer(//*[@os='p2'])"/>
    3333
    … …  
    4444    xpointer="xpointer(//*[@os='ag'])"/>
    4545
    46 <screen os="ah"><userinput>echo -en '#undef STANDARD_INCLUDE_DIR\n#define STANDARD_INCLUDE_DIR "/tools/include/"\n\n' >> gcc/config/rs6000/sysv4.h
    47 echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
     46<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
    4847echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h</userinput></screen>
    49 
    50     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="../common/gcc-static.xml"
    52     xpointer="xpointer(//*[@os='ai'])"/>
    53 
    54     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="../common/gcc-static.xml"
    56     xpointer="xpointer(//*[@os='aj'])"/>
    5748
    5849    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    10091    xpointer="xpointer(//*[@os='aq'])"/>
    10192
     93    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     94    href="../common/gcc-static.xml"
     95    xpointer="xpointer(//*[@os='ar'])"/>
     96
    10297  </sect2>
    10398
Note: See TracChangeset for help on using the changeset viewer.