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

Location:
BOOK/temp-system/multilib
Files:
14 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r88ef769 r03e6a40  
    4949    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
    5050
    51     <variablelist os="ea">
    52       <title>The meaning of the new configure options:</title>
    53 
    54       <varlistentry>
    55         <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
    56         <listitem>
    57           <para>Tells the compiler to use our 64-bit build flags.</para>
    58         </listitem>
    59       </varlistentry>
    60 
    61     </variablelist>
    62 
    6351    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6452    href="../common/binutils.xml"

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

    r88ef769 r03e6a40  
    3030    href="../common/bison.xml"
    3131    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'])"/>
    4032
    4133    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-testsuite-tools-check" role="wrap">
     8<sect1 id="ch-temp-system-check" role="wrap">
    99  <?dbhtml filename="check.html"?>
    1010
    1111  <title>Check-&check-version;</title>
    1212
    13   <indexterm zone="ch-testsuite-tools-check">
     13  <indexterm zone="ch-temp-system-check">
    1414    <primary sortas="a-Check">Check</primary>
    1515  </indexterm>
    … …  
    2828<screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
    2929    --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64</userinput></screen>
     30
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     32    href="../common/check.xml"
     33    xpointer="xpointer(//*[@os='e'])"/>
    3034
    3135    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    3232  <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
    3333  (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
     34  kernel version requirement is that glibc is built to generate the library
    3535  for the smallest version of the Linux kernel expected to be supported.</para>
    3636

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

    r88ef769 r03e6a40  
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/common/cloog.xml"
     35    xpointer="xpointer(//*[@os='s1'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/common/cloog.xml"
     39    xpointer="xpointer(//*[@os='s2'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3442    href="../common/cloog.xml"
    3543    xpointer="xpointer(//*[@os='c'])"/>

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

    r88ef769 r03e6a40  
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3434    href="../common/coreutils.xml"
     35    xpointer="xpointer(//*[@os='p1'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/coreutils.xml"
     39    xpointer="xpointer(//*[@os='p2'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/coreutils.xml"
    3543    xpointer="xpointer(//*[@os='bd'])"/>
    3644
    … …  
    4250    href="../common/coreutils.xml"
    4351    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'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    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'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    7777  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
    7878  --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 \
     79  --disable-libstdcxx-pch --with-gmp=/tools --with-mpfr=/tools \
     80  --with-mpc=/tools --with-isl=/tools --with-cloog=/tools --with-system-zlib \
    8281  --with-native-system-header-dir=/tools/include --disable-libssp \
    83   --disable-install-libiberty  --enable-libstdcxx-time \
    84   --enable-checking=release</userinput></screen>
     82  --enable-libstdcxx-time --enable-checking=release</userinput></screen>
    8583
    8684    <variablelist os="dd">

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

    r88ef769 r03e6a40  
    6464    xpointer="xpointer(//*[@os='h'])"/>
    6565
    66     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    67     href="../common/gettext.xml"
    68     xpointer="xpointer(//*[@os='i'])"/>
    69 
    7066  </sect2>
    7167

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

    r88ef769 r03e6a40  
    4242    --libdir=/tools/lib64 --enable-cxx</userinput></screen>
    4343
     44    <variablelist os="ba">
     45      <title>The meaning of the new configure option:</title>
     46
     47      <varlistentry>
     48        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
     49        <listitem>
     50          <para>Tells the compiler to use our 64-bit build flags.</para>
     51        </listitem>
     52      </varlistentry>
     53
     54    </variablelist>
     55
    4456    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4557    href="../common/gmp.xml"

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

    r88ef769 r03e6a40  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     29<screen os="aa"><userinput>PKG_CONFIG= CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    3030   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3131

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

    r88ef769 r03e6a40  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     29<screen os="b"><userinput>PERL=/usr/bin/perl CC="${CC} ${BUILD64}" \
     30./configure --prefix=/tools \
    3031   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/texinfo.xml"
     35    xpointer="xpointer(//*[@os='ba'])"/>
    3136
    3237    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/util-linux.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-boot-util-linux" role="wrap">
     8<sect1 id="ch-temp-system-util-linux" role="wrap">
    99  <?dbhtml filename="util-linux.html"?>
    1010
    1111  <title>Util-linux-&util-linux-version;</title>
    1212
    13   <indexterm zone="ch-boot-util-linux">
     13  <indexterm zone="ch-temp-system-util-linux">
    1414    <primary sortas="a-Util-linux">Util-linux</primary>
    15     <secondary>boot</secondary>
     15    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    … …  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= \
    30   ./configure --prefix=/tools --exec-prefix=/tools \
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
    3130    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    32     --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
     31    --libdir=/tools/lib64 --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/util-linux.xml"
     35    xpointer="xpointer(//*[@os='c'])"/>
    3336
    3437    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    6060    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6161    href="../common/vim.xml"
     62    xpointer="xpointer(//*[@os='f'])"/>
     63
     64    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     65    href="../common/vim.xml"
    6266    xpointer="xpointer(//*[@os='g'])"/>
    6367

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

    r88ef769 r03e6a40  
    1212
    1313  <indexterm zone="ch-temp-system-xz">
    14     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
     14    <primary sortas="a-XZ Utils">XZ Utils</primary>
    1515    <secondary>temporary system</secondary>
    1616  </indexterm>
    … …  
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of XZ-Utils</title>
     23    <title>Installation of XZ Utils</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    2828
    2929<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    30      --build=${CLFS_HOST} --host=${CLFS_TARGET}\
     30     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3131     --libdir=/tools/lib64</userinput></screen>
    3232
Note: See TracChangeset for help on using the changeset viewer.