Ignore:
Timestamp:
Dec 13, 2015, 4:21:52 PM (9 years ago)
Author:
Chris Staub <chris@…>
Branches:
sysvinit
Children:
fc86858d
Parents:
dbc5b02 (diff), c7477f8e (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 'sysvinit' of clfs.org:cross-lfs into sysvinit

Location:
BOOK/temp-system/multilib
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • BOOK/temp-system/multilib/binutils.xml

    rdbc5b02 r991595cf  
    4545
    4646<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
    47     --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
    48     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
    49     --disable-nls --enable-shared --enable-64-bit-bfd \
    50     --enable-gold=yes --enable-plugins --enable-threads</userinput></screen>
     47    --prefix=/tools \
     48    --libdir=/tools/lib64 \
     49    --with-lib-path=/tools/lib64:/tools/lib \
     50    --build=${CLFS_HOST} \
     51    --host=${CLFS_TARGET} \
     52    --target=${CLFS_TARGET} \
     53    --disable-nls \
     54    --enable-shared \
     55    --enable-64-bit-bfd \
     56    --enable-gold=yes \
     57    --enable-plugins \
     58    --enable-threads</userinput></screen>
    5159
    5260    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/check.xml

    rdbc5b02 r991595cf  
    3030    xpointer="xpointer(//*[@os='c'])"/>
    3131
    32 <screen os="d"><userinput>./configure --prefix=/tools \
    33     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64</userinput></screen>
     32<screen os="d"><userinput>./configure \
     33    --prefix=/tools \
     34    --build=${CLFS_HOST} \
     35    --host=${CLFS_TARGET} \
     36    --libdir=/tools/lib64</userinput></screen>
    3437
    3538    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/file.xml

    rdbc5b02 r991595cf  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>./configure --prefix=/tools \
    30    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     29<screen os="b"><userinput>./configure \
     30    --prefix=/tools \
     31    --libdir=/tools/lib64 \
     32    --build=${CLFS_HOST} \
     33    --host=${CLFS_TARGET}</userinput></screen>
    3134
    3235  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/flex.xml

    rdbc5b02 r991595cf  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen os="cb"><userinput>M4=m4 ./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     37<screen os="cb"><userinput>M4=m4 \
     38./configure \
     39    --prefix=/tools \
     40    --build=${CLFS_HOST} \
     41    --host=${CLFS_TARGET} \
    3942    --cache-file=config.cache</userinput></screen>
    4043
  • BOOK/temp-system/multilib/gcc.xml

    rdbc5b02 r991595cf  
    7171    xpointer="xpointer(//*[@os='h'])"/>
    7272
    73 <screen os="dc"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
    74     --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    75     --target=${CLFS_TARGET} --with-local-prefix=/tools \
    76     --enable-languages=c,c++ --with-system-zlib \
     73<screen os="dc"><userinput>../gcc-&gcc-version;/configure \
     74    --prefix=/tools \
     75    --libdir=/tools/lib64 \
     76    --build=${CLFS_HOST} \
     77    --host=${CLFS_TARGET} \
     78    --target=${CLFS_TARGET} \
     79    --with-local-prefix=/tools \
     80    --enable-languages=c,c++ \
     81    --with-system-zlib \
    7782    --with-native-system-header-dir=/tools/include \
    78     --disable-libssp --enable-install-libiberty</userinput></screen>
     83    --disable-libssp \
     84    --enable-install-libiberty</userinput></screen>
    7985
    8086    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/gmp.xml

    rdbc5b02 r991595cf  
    4141    xpointer="xpointer(//*[@os='b'])"/>
    4242
    43 <screen os="c"><userinput>CC_FOR_BUILD=gcc ./configure --prefix=/tools \
    44     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    45     --libdir=/tools/lib64 --enable-cxx</userinput></screen>
     43<screen os="c"><userinput>CC_FOR_BUILD=gcc \
     44./configure \
     45    --prefix=/tools \
     46    --build=${CLFS_HOST} \
     47    --host=${CLFS_TARGET} \
     48    --libdir=/tools/lib64 \
     49    --enable-cxx</userinput></screen>
    4650
    4751    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/isl.xml

    rdbc5b02 r991595cf  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>./configure --prefix=/tools \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     29<screen os="b"><userinput>./configure \
     30    --prefix=/tools \
     31    --build=${CLFS_HOST} \
     32    --host=${CLFS_TARGET} \
    3133    --libdir=/tools/lib64</userinput></screen>
    3234
  • BOOK/temp-system/multilib/mpc.xml

    rdbc5b02 r991595cf  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>./configure --prefix=/tools \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     29<screen os="b"><userinput>./configure \
     30    --prefix=/tools \
     31    --build=${CLFS_HOST} \
     32    --host=${CLFS_TARGET} \
    3133    --libdir=/tools/lib64</userinput></screen>
    3234
  • BOOK/temp-system/multilib/mpfr.xml

    rdbc5b02 r991595cf  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen os="b"><userinput>./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     37<screen os="b"><userinput>./configure \
     38    --prefix=/tools \
     39    --build=${CLFS_HOST} \
     40    --host=${CLFS_TARGET} \
    3941    --libdir=/tools/lib64</userinput></screen>
    4042
  • BOOK/temp-system/multilib/ncurses.xml

    rdbc5b02 r991595cf  
    3939    xpointer="xpointer(//*[@os='a'])"/>
    4040
    41 <screen os="b"><userinput>./configure --prefix=/tools --with-shared \
    42    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    43    --without-debug --without-ada \
    44    --enable-overwrite --with-build-cc=gcc \
    45    --libdir=/tools/lib64</userinput></screen>
     41<screen os="b"><userinput>./configure \
     42    --prefix=/tools \
     43    --with-shared \
     44    --build=${CLFS_HOST} \
     45    --host=${CLFS_TARGET} \
     46    --without-debug \
     47    --without-ada \
     48    --enable-overwrite \
     49    --with-build-cc=gcc \
     50    --libdir=/tools/lib64</userinput></screen>
    4651
    4752    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/util-linux.xml

    rdbc5b02 r991595cf  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>./configure --prefix=/tools \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --libdir='${prefix}'/lib64 --disable-makeinstall-chown \
    32     --disable-makeinstall-setuid --without-python</userinput></screen>
     29<screen os="be"><userinput>./configure \
     30    --prefix=/tools \
     31    --build=${CLFS_HOST} \
     32    --host=${CLFS_TARGET} \
     33    --libdir='${prefix}'/lib64 \
     34    --disable-makeinstall-chown \
     35    --disable-makeinstall-setuid \
     36    --without-python</userinput></screen>
    3337
    3438    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/xz.xml

    rdbc5b02 r991595cf  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="cb"><userinput>./configure --prefix=/tools \
    30      --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31      --libdir=/tools/lib64</userinput></screen>
     29<screen os="cb"><userinput>./configure \
     30    --prefix=/tools \
     31    --build=${CLFS_HOST} \
     32    --host=${CLFS_TARGET} \
     33    --libdir=/tools/lib64</userinput></screen>
    3234
    3335    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/temp-system/multilib/zlib.xml

    rdbc5b02 r991595cf  
    3131    xpointer="xpointer(//*[@os='a'])"/>
    3232
    33 <screen os="b"><userinput>./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
     33<screen os="b"><userinput>./configure \
     34    --prefix=/tools \
     35    --libdir=/tools/lib64</userinput></screen>
    3436
    3537    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.