Ignore:
Timestamp:
Dec 18, 2013, 1:04:00 AM (11 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/temp-system/multilib
Files:
1 added
1 deleted
13 edited
2 moved

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/multilib/binutils.xml

    r1c9985f r026bb5d  
    2323    <title>Installation of Binutils</title>
    2424
     25<!-- Branch update patch area
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../../final-system/common/binutils.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../../final-system/common/binutils.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
     33-->
    2534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2635    href="../common/binutils.xml"
    … …  
    3544    xpointer="xpointer(//*[@os='i'])"/>
    3645
    37 <screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-version;/configure \
     46<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
    3847    --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
    3948    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \

  • BOOK/temp-system/multilib/bison.xml

    r1c9985f r026bb5d  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../common/bison.xml"
     27    xpointer="xpointer(//*[@os='s1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/bison.xml"
     31    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/common/bison.xml"
     35    xpointer="xpointer(//*[@os='t3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/common/bison.xml"
     39    xpointer="xpointer(//*[@os='t4'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2642    href="../../final-system/common/bison.xml"
    2743    xpointer="xpointer(//*[@os='a'])"/>
    2844
    29 <screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     45<screen os="ca"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
     46    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     47    --cache-file=config.cache</userinput></screen>
    3148
    3249    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/choose.xml

    r1c9985f r026bb5d  
    3030  method.</para>
    3131
     32  <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
     33  (having been compiled with GCC-4.1.2 or greater). The reason for the
     34  kernel version requirement is that eglibc is built to generate the library
     35  for the smallest version of the Linux kernel expected to be supported.</para>
     36
     37  <para>To check your kernel version, run <command>cat /proc/version</command>
     38  - if it does not say that you are running a 2.6.32 or later Linux kernel,
     39  compiled with GCC 4.1.2 or later, you cannot chroot.</para>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/cloog.xml

    r1c9985f r026bb5d  
    66]>
    77
    8 <sect1 id="ch-temp-system-cloog-ppl" role="wrap">
    9   <?dbhtml filename="cloog-ppl.html"?>
     8<sect1 id="ch-temp-system-cloog" role="wrap">
     9  <?dbhtml filename="cloog.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version;</title>
     11  <title>CLooG-&cloog-version;</title>
    1212
    13   <indexterm zone="ch-temp-system-cloog-ppl">
    14     <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-temp-system-cloog">
     14    <primary sortas="a-CLooG">CLooG</primary>
    1515    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/cloog-ppl.xml"
     19  href="../../final-system/common/cloog.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of CLooG-PPL</title>
     23    <title>Installation of CLooG</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='s2'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/cloog-ppl.xml"
     26    href="../common/cloog.xml"
    3527        xpointer="xpointer(//*[@os='a'])"/>
    3628
    3729<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
    39     --libdir=/tools/lib64 --enable-shared \
    40     --with-gmp=/tools --with-ppl=/tools</userinput></screen>
     30    --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64 \
     31     --enable-shared --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
    4132
    4233    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    43     href="../common/cloog-ppl.xml"
     34    href="../common/cloog.xml"
    4435    xpointer="xpointer(//*[@os='c'])"/>
    4536
    4637    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    47     href="../common/cloog-ppl.xml"
     38    href="../common/cloog.xml"
    4839    xpointer="xpointer(//*[@os='d'])"/>
    4940       
    5041    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="../common/cloog-ppl.xml"
     42    href="../common/cloog.xml"
    5243    xpointer="xpointer(//*[@os='e'])"/>
    5344
    5445    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="../common/cloog-ppl.xml"
     46    href="../common/cloog.xml"
    5647    xpointer="xpointer(//*[@os='f'])"/>
    5748
    … …  
    6253
    6354    <para>Details on this package are located in <xref
    64     linkend="contents-cloog-ppl" role="."/></para>
     55    linkend="contents-cloog" role="."/></para>
    6556
    6657  </sect2>

  • BOOK/temp-system/multilib/coreutils.xml

    r1c9985f r026bb5d  
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/coreutils.xml"
    27     xpointer="xpointer(//*[@os='aa'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/coreutils.xml"
    31     xpointer="xpointer(//*[@os='ab'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/coreutils.xml"
    3527    xpointer="xpointer(//*[@os='ba'])"/>
    3628
    … …  
    4638    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4739    --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/coreutils.xml"
     43    xpointer="xpointer(//*[@os='be1'])"/>
     44
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../common/coreutils.xml"
     47    xpointer="xpointer(//*[@os='s1'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../common/coreutils.xml"
     51    xpointer="xpointer(//*[@os='s2'])"/>
    4852
    4953    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/flex.xml

    r1c9985f r026bb5d  
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626  href="../common/flex.xml"
    27   xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30   href="../common/flex.xml"
    31   xpointer="xpointer(//*[@os='p2'])"/>
    32 
    33   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34   href="../common/flex.xml"
    3527  xpointer="xpointer(//*[@os='t3'])"/>
    3628
    … …  
    4335    xpointer="xpointer(//*[@os='a'])"/>
    4436
    45 <screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     37<screen os="cb"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
    4638    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4739    --cache-file=config.cache</userinput></screen>

  • BOOK/temp-system/multilib/gawk.xml

    r1c9985f r026bb5d  
    2222  <sect2 role="installation">
    2323    <title>Installation of Gawk</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../common/gawk.xml"
     27    xpointer="xpointer(//*[@os='s1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/gawk.xml"
     31    xpointer="xpointer(//*[@os='s2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r1c9985f r026bb5d  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../cross-tools/multilib/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="../../cross-tools/multilib/gcc-static.xml"
     30    href="../../final-system/common/gcc.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    3232
    … …  
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/gcc.xml"
    51     xpointer="xpointer(//*[@os='cf'])"/>
     50    href="../../final-system/common/gcc.xml"
     51    xpointer="xpointer(//*[@os='fix1'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/gcc.xml"
    55     xpointer="xpointer(//*[@os='cg'])"/>
     54    href="../../final-system/common/gcc.xml"
     55    xpointer="xpointer(//*[@os='fix2'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    7474  ../gcc-&gcc-version;/configure --prefix=/tools \
    7575  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    76   --target=${CLFS_TARGET} --with-local-prefix=/tools  --enable-long-long \
    77   --enable-c99 --enable-shared --enable-threads=posix \
    78   --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
    79   --disable-libstdcxx-pch</userinput></screen>
     76  --target=${CLFS_TARGET} --libexecdir=/tools/lib64 --with-local-prefix=/tools \
     77  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
     78  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
     79  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
     80  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
     81  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
     82  --with-native-system-header-dir=/tools/include --disable-libssp \
     83  --disable-install-libiberty  --enable-libstdcxx-time \
     84  --enable-checking=release</userinput></screen>
    8085
    8186    <variablelist os="dd">
    … …  
    97102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    98103    href="../common/gcc.xml"
    99     xpointer="xpointer(//*[@os='ts1'])"/>
     104    xpointer="xpointer(//*[@os='s1'])"/>
    100105
    101106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    102107    href="../common/gcc.xml"
    103     xpointer="xpointer(//*[@os='ts2'])"/>
     108    xpointer="xpointer(//*[@os='s2'])"/>
    104109
    105110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/gmp.xml

    r1c9985f r026bb5d  
    3737    xpointer="xpointer(//*[@os='a'])"/>
    3838
    39 <screen os="b"><userinput>HOST_CC=gcc CPPFLAGS=-fexceptions CC="${CC} \
     39<screen os="b"><userinput>HOST_CC=gcc CC="${CC} \
    4040    ${BUILD64}" CXX="${CXX} ${BUILD64}" ./configure --prefix=/tools \
    4141    --build=${CLFS_HOST} --host=${CLFS_TARGET} \

  • BOOK/temp-system/multilib/grep.xml

    r1c9985f r026bb5d  
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/grep.xml"
    27     xpointer="xpointer(//*[@os='t1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/grep.xml"
    31     xpointer="xpointer(//*[@os='t2'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/grep.xml"
    3527    xpointer="xpointer(//*[@os='a'])"/>
    3628
    3729<screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    3830    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    39     --disable-perl-regexp --without-included-regex \
    40     --cache-file=config.cache</userinput></screen>
     31    --without-included-regex</userinput></screen>
    4132
    4233    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/isl.xml

    r1c9985f r026bb5d  
    66]>
    77
    8 <sect1 id="ch-system-glib-n32" role="wrap">
    9   <?dbhtml filename="glib-n32.html"?>
     8<sect1 id="ch-temp-system-isl" role="wrap">
     9  <?dbhtml filename="isl.html"?>
    1010
    11   <title>Glib-&glib-version; N32 Libraries</title>
     11  <title>ISL-&isl-version;</title>
    1212
    13   <indexterm zone="ch-system-glib-n32">
    14     <primary sortas="a-Glib">Glib</primary>
    15     <secondary>N32</secondary>
     13  <indexterm zone="ch-temp-system-isl">
     14    <primary sortas="a-ISL">ISL</primary>
     15    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/glib.xml"
     19  href="../../final-system/common/isl.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Glib</title>
     23    <title>Installation of ISL</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/glib.xml"
     26    href="../common/isl.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
     30  ./configure --prefix=/tools \
     31    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     32    --libdir=/tools/lib64 --with-gmp-prefix=/tools</userinput></screen>
    3033
    3134    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    32     href="../common/glib.xml"
     35    href="../common/isl.xml"
    3336    xpointer="xpointer(//*[@os='c'])"/>
    3437
    3538    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/glib.xml"
     39    href="../common/isl.xml"
    3740    xpointer="xpointer(//*[@os='d'])"/>
    38 
     41       
    3942    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/glib.xml"
     43    href="../common/isl.xml"
    4144    xpointer="xpointer(//*[@os='e'])"/>
    4245
    4346    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/glib.xml"
     47    href="../common/isl.xml"
    4548    xpointer="xpointer(//*[@os='f'])"/>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/glib.xml"
    49     xpointer="xpointer(//*[@os='g'])"/>
    5049
    5150  </sect2>
    … …  
    5554
    5655    <para>Details on this package are located in <xref
    57     linkend="contents-glib" role="."/></para>
     56    linkend="contents-isl" role="."/></para>
    5857
    5958  </sect2>

  • BOOK/temp-system/multilib/mpc.xml

    r1c9985f r026bb5d  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" EGREP="grep -E" \
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
    3030  ./configure --prefix=/tools \
    3131    --build=${CLFS_HOST} --host=${CLFS_TARGET} \

  • BOOK/temp-system/multilib/mpfr.xml

    r1c9985f r026bb5d  
    2222  <sect2 role="installation">
    2323    <title>Installation of MPFR</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../final-system/common/mpfr.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/common/mpfr.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/patch.xml

    r1c9985f r026bb5d  
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/patch.xml"
    27     xpointer="xpointer(//*[@os='cc1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/patch.xml"
    31     xpointer="xpointer(//*[@os='cc2'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/patch.xml"
    3527    xpointer="xpointer(//*[@os='a'])"/>
    3628
    3729<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    39     --cache-file=config.cache</userinput></screen>
     30    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    4031
    4132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/vim.xml

    r1c9985f r026bb5d  
    3030    href="../common/vim.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/vim.xml"
    35     xpointer="xpointer(//*[@os='s1'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/vim.xml"
    39     xpointer="xpointer(//*[@os='s2'])"/>
    4032
    4133    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.