Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/gcc.xml

    r88ef769 r03e6a40  
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4141    href="../common/gcc.xml"
    42     xpointer="xpointer(//*[@os='d'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/gcc.xml"
    46     xpointer="xpointer(//*[@os='e'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/gcc.xml"
    5042    xpointer="xpointer(//*[@os='f'])"/>
    5143
    … …  
    6557    --enable-__cxa_atexit --enable-c99 --enable-long-long \
    6658    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
    67     --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
    68     --enable-checking=release --enable-libstdcxx-time \
    69     --disable-install-libiberty</userinput></screen>
     59    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    7060
    7161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.