Ignore:
Timestamp:
Dec 18, 2013, 1:04:00 AM (12 years ago)
Author:
Chris Staub <chris@…>
Children:
f975b3a
Parents:
1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

Location:
BOOK/cross-tools/multilib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • BOOK/cross-tools/multilib/binutils.xml

    r1c9985f r026bb5d  
    2727    xpointer="xpointer(//*[@os='da'])"/>
    2828
     29<!-- Branch update patch area
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../../final-system/common/binutils.xml"
     32    xpointer="xpointer(//*[@os='p1'])"/>
     33
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35    href="../../final-system/common/binutils.xml"
     36    xpointer="xpointer(//*[@os='p2'])"/>
     37-->
    2938    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3039    href="../common/binutils.xml"
     
    3948    xpointer="xpointer(//*[@os='i'])"/>
    4049
    41 <screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure \
     50<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \
    4251  --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
    43   --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls --enable-shared \
    44   --enable-64-bit-bfd</userinput></screen>
     52  --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
     53  --disable-nls --disable-static --enable-64-bit-bfd</userinput></screen>
    4554
    4655    <variablelist os="bd">
     
    7382      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7483      href="../common/binutils.xml"
    75       xpointer="xpointer(//*[@os='bd8'])"/>
     84      xpointer="xpointer(//*[@os='bd7'])"/>
    7685
    7786    </variablelist>
  • BOOK/cross-tools/multilib/eglibc-64bit.xml

    r1c9985f r026bb5d  
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="eglibc.xml"
    31     xpointer="xpointer(//*[@os='db'])"/>
     30    href="../../final-system/common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='s1'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="eglibc.xml"
    35     xpointer="xpointer(//*[@os='dc'])"/>
     34    href="../../final-system/common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='s2'])"/>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    6464    ../eglibc-&eglibc-version;/configure --prefix=/tools \
    6565    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
    66     --disable-profile --enable-add-ons \
    67     --with-tls --enable-kernel=2.6.0 --with-__thread \
     66    --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
    6867    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    69     --cache-file=config.cache</userinput></screen>
     68    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
    7069
    7170    <variablelist os="dg">
  • BOOK/cross-tools/multilib/eglibc.xml

    r1c9985f r026bb5d  
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/eglibc.xml"
    31     xpointer="xpointer(//*[@os='db'])"/>
     30    href="../../final-system/common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='s1'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/eglibc.xml"
    35     xpointer="xpointer(//*[@os='dc'])"/>
     34    href="../../final-system/common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='s2'])"/>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    5959    ../eglibc-&eglibc-version;/configure --prefix=/tools \
    6060    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
    61     --disable-profile --enable-add-ons \
    62     --with-tls --enable-kernel=2.6.0 --with-__thread \
     61    --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
    6362    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    64     --cache-file=config.cache</userinput></screen>
     63    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
    6564
    6665    <variablelist os="dg">
     
    111110      xpointer="xpointer(//*[@os='dg10'])"/>
    112111
     112      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     113      href="../common/eglibc.xml"
     114      xpointer="xpointer(//*[@os='dg11'])"/>
     115
    113116    </variablelist>
    114117
  • BOOK/cross-tools/multilib/gcc-final.xml

    r1c9985f r026bb5d  
    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"
  • BOOK/cross-tools/multilib/gcc-static.xml

    r1c9985f r026bb5d  
    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
     
    4747    href="../common/gcc-static.xml"
    4848    xpointer="xpointer(//*[@os='ah'])"/>
    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'])"/>
    5749
    5850    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    7971  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
    8072  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
    81   --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
     73  --with-sysroot=${CLFS} --with-local-prefix=/tools \
     74  --with-native-system-header-dir=/tools/include --disable-nls \
    8275  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
    83   --with-ppl=/cross-tools --with-cloog=/cross-tools \
    84   --without-headers --with-newlib --disable-decimal-float \
    85   --disable-libgomp --disable-libmudflap --disable-libssp \
    86   --disable-threads --enable-languages=c</userinput></screen>
     76  --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
     77  --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
     78  --disable-libssp --disable-threads --disable-libatomic --disable-libitm \
     79  --disable-libsanitizer --disable-libquadmath --disable-target-libiberty \
     80  --disable-target-zlib --with-system-zlib --enable-cloog-backend=isl \
     81  --with-isl=/cross-tools --disable-isl-version-check --enable-languages=c \
     82  --enable-checking=release</userinput></screen>
    8783
    8884    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    106102    xpointer="xpointer(//*[@os='aq'])"/>
    107103
     104    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     105    href="../common/gcc-static.xml"
     106    xpointer="xpointer(//*[@os='ar'])"/>
     107
    108108  </sect2>
    109109
Note: See TracChangeset for help on using the changeset viewer.