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/multilib/gcc-final.xml

    rec008670 r229ed25  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="gcc-static.xml"
     26    href="../../final-system/common/gcc.xml"
    2727    xpointer="xpointer(//*[@os='p1'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="gcc-static.xml"
     30    href="../../final-system/common/gcc.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    3232
    … …  
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5050    href="gcc-static.xml"
    51     xpointer="xpointer(//*[@os='ai'])"/>
    52 
    53     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="gcc-static.xml"
    55     xpointer="xpointer(//*[@os='aj'])"/>
    56 
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="gcc-static.xml"
    5951    xpointer="xpointer(//*[@os='f'])"/>
    6052
    … …  
    7062  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
    7163  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
    72   --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
    73   --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
    74   --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
    75   --with-ppl=/cross-tools --with-cloog=/cross-tools \
    76   --enable-long-long --enable-threads=posix</userinput></screen>
     64  --with-sysroot=${CLFS} --with-local-prefix=/tools \
     65  --with-native-system-header-dir=/tools/include \
     66  --disable-nls --enable-shared --disable-static \
     67  --enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 \
     68  --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \
     69  --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
     70  --enable-cloog-backend=isl --with-isl=/cross-tools \
     71  --disable-isl-version-check --with-system-zlib --enable-checking=release \
     72  --enable-libstdcxx-time</userinput></screen>
    7773
    7874    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.