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/common
Files:
15 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/common/bash.xml

    r88ef769 r03e6a40  
    5858<!--
    5959    <variablelist os="c">
    60       <title>The meaning of the configure option:</title>
     60      <title>The meaning of the new configure option:</title>
    6161
    6262      <varlistentry>
    … …  
    8181<c:command>make install</c:command>
    8282
    83     <c:para>Make a link for programs that use <c:command>sh</c:command> for
    84     a shell:</c:para>
    85 
    86 <c:command>ln -sv bash /tools/bin/sh</c:command>
    87 
    8883  </c:install>
    8984

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

    r88ef769 r03e6a40  
    2727<screen os='s2'><userinput>cp -v Makefile.in{,.orig}
    2828sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/bison.xml"
    31     xpointer="xpointer(//*[@os='t3'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../../final-system/common/bison.xml"
    35     xpointer="xpointer(//*[@os='t4'])"/>
    3629
    3730    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/common/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>
    … …  
    2929<screen os="d"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     31
     32    <variablelist os="e">
     33      <title>The meaning of the new configure option:</title>
     34
     35      <varlistentry>
     36        <term><parameter>PKG_CONFIG=</parameter></term>
     37        <listitem>
     38          <para>Prevents check from using <command>pkg-config</command> to
     39          search for additional packages that may be on the host but
     40          won't exist inside the temporary build environment.</para>
     41        </listitem>
     42      </varlistentry>
     43
     44    </variablelist>
    3145
    3246    <para os="f">Build the package:</para>
    … …  
    6377          <para>Awk script for generating C unit tests for use with the C the
    6478          Check unit testing framework</para>
    65           <indexterm zone="ch-testsuite-tools-check checkmk">
     79          <indexterm zone="ch-temp-system-check checkmk">
    6680            <primary sortas="b-check">checkmk</primary>
    6781          </indexterm>
    … …  
    7488          <para>Contains functions that allow Check to be called from a test
    7589          program</para>
    76           <indexterm zone="ch-testsuite-tools-check libcheck">
     90          <indexterm zone="ch-temp-system-check libcheck">
    7791            <primary sortas="c-libcheck">libcheck.{a,so};</primary>
    7892          </indexterm>

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

    r88ef769 r03e6a40  
    3636  <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
    3737  (having been compiled with GCC-4.1.2 or greater). The reason for the
    38   kernel version requirement is that eglibc is built to generate the library
     38  kernel version requirement is that glibc is built to generate the library
    3939  for the smallest version of the Linux kernel expected to be supported.</para>
    4040

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

    r88ef769 r03e6a40  
    2929    --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
    3030
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     32    href="../../final-system/common/cloog.xml"
     33    xpointer="xpointer(//*[@os='s1'])"/>
     34
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     36    href="../../final-system/common/cloog.xml"
     37    xpointer="xpointer(//*[@os='s2'])"/>
     38
    3139    <para os="c">Compile the package:</para>
    3240

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

    r88ef769 r03e6a40  
    3333EOF</userinput></screen>
    3434
     35    <para os="p1">Apply a patch to prevent Coreutils from generating manpages :</para>
     36
     37<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-noman-patch;</userinput></screen>
     38
    3539    <para os="bd">Prepare Coreutils for compilation:</para>
    3640
    … …  
    5155
    5256    </variablelist>
    53 
    54     <para os="s1">Apply a sed to allow completion of the build:</para>
    55 
    56 <screen os="s2"><userinput>cp -v Makefile{,.orig}
    57 sed -e 's/^#run_help2man\|^run_help2man/#&amp;/' \
    58   -e 's/^\##run_help2man/run_help2man/' Makefile.orig > Makefile</userinput></screen>
    5957
    6058   <para os="bf">Compile the package:</para>

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

    r88ef769 r03e6a40  
    2222  <sect2 role="installation">
    2323    <title>Installation of Gawk</title>
    24 
    25     <para os="s1">Apply a sed which will allow the build system to complete without error:</para>
    26 
    27 <screen os="s2"><userinput>cp -v extension/Makefile.in{,.orig}
    28 sed -e 's/check-recursive all-recursive: check-for-shared-lib-support/check-recursive all-recursive:/' \
    29   extension/Makefile.in.orig > extension/Makefile.in</userinput></screen>
    3024
    3125    <para os="a">Prepare Gawk for compilation:</para>

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

    r88ef769 r03e6a40  
    7575  --enable-c99 --enable-shared --enable-threads=posix --disable-multilib \
    7676  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
    77   --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
    78   --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
    79   --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
     77  --disable-libstdcxx-pch --with-gmp=/tools --with-mpfr=/tools \
     78  --with-mpc=/tools --with-isl=/tools --with-cloog=/tools --with-system-zlib \
    8079  --with-native-system-header-dir=/tools/include --disable-libssp \
    81   --disable-install-libiberty --enable-checking=release \
    82   --enable-libstdcxx-time</userinput></screen>
     80  --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    8381
    8482    <variablelist os="cl">
    85       <title>The meaning of the new configure options:</title>
     83      <title>The meaning of the new configure option:</title>
    8684
    8785      <varlistentry os="cl1">

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

    r88ef769 r03e6a40  
    2929<screen os="b"><userinput>cd gettext-tools</userinput></screen>
    3030
    31     <para os="t1">When cross-compiling the Gettext configure script assumes we
    32     don't have a working wcwidth when we do. The following will fix possible
     31    <para os="t1">When cross-compiling, the Gettext
     32    <command>configure</command> script assumes we don't have a working wcwidth
     33    even when when we do. The following will fix possible
    3334    compilation errors because of this assumption:</para>
    3435
    … …  
    4142    --disable-shared --cache-file=config.cache</userinput></screen>
    4243
    43     <variablelist os="e">
    44       <title>The meaning of the configure options:</title>
     44    <para os="e">Compile the required programs and support library:</para>
    4545
    46       <varlistentry os="e1">
    47         <term><parameter>--disable-shared</parameter></term>
    48         <listitem>
    49           <para>This tells Gettext not to create a shared library.</para>
    50         </listitem>
    51       </varlistentry>
     46<screen os="f"><userinput>make -C gnulib-lib
     47make -C src msgfmt msgmerge xgettext</userinput></screen>
    5248
    53     </variablelist>
     49    <para os="g">Install the <command>msgfmt</command>,
     50    <command>msgmerge</command> and <command>xgettext</command> binaries:</para>
    5451
    55     <para os="f">Compile the package:</para>
    56 
    57 <screen os="g"><userinput>make -C gnulib-lib
    58 make -C src msgfmt</userinput></screen>
    59 
    60     <para os="h">Install the <command>msgfmt</command> binary:</para>
    61 
    62 <screen os="i"><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
     52<screen os="h"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
    6353
    6454  </sect2>

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

    r88ef769 r03e6a40  
    4040          assumes there is no usable <filename>regex.h</filename> installed and
    4141          instead uses the one included with Grep. This switch forces the use of
    42           the regex functions from EGLIBC.</para>
     42          the regex functions from GLIBC.</para>
    4343        </listitem>
    4444      </varlistentry>

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

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

  • BOOK/temp-system/common/ncurses.xml

    r88ef769 r03e6a40  
    7676        <term><parameter>--with-build-cc=gcc</parameter></term>
    7777        <listitem>
    78           <para>This tells Ncurses what type of compiler we are using.</para>
     78          <para>This tells Ncurses which compiler to use to build native tools
     79          when cross-compiling.</para>
    7980        </listitem>
    8081      </varlistentry>

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

    r88ef769 r03e6a40  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>./configure --prefix=/tools \
     29<screen os="b"><userinput>PERL=/usr/bin/perl ./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     31
     32    <variablelist os="ba">
     33      <title>The meaning of the new configure option:</title>
     34
     35      <varlistentry>
     36        <term><parameter>PERL=/usr/bin/perl</parameter></term>
     37        <listitem>
     38          <para>This forces Texinfo to use
     39          <filename class="directory">/usr/bin</filename> as the location of
     40          <command>perl</command>, as some host systems may have it in
     41          <filename class="directory">/bin</filename>.</para>
     42        </listitem>
     43      </varlistentry>
     44
     45    </variablelist>
    3146
    3247    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-chroot-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-chroot-util-linux">
     13  <indexterm zone="ch-temp-system-util-linux">
    1414    <primary sortas="a-Util-linux">Util-linux</primary>
    15     <secondary>chroot</secondary>
     15    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    … …  
    2929<screen os="b"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --disable-makeinstall-chown --disable-su --disable-login</userinput></screen>
     31    --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
     32
     33    <variablelist os="c">
     34      <title>The meaning of the new configure option:</title>
     35
     36      <varlistentry>
     37        <term><parameter>--disable-makeinstall-chown</parameter></term>
     38        <listitem>
     39          <para>This prevents Util-linux from trying to perform any
     40          chown commands when it is installed.</para>
     41        </listitem>
     42      </varlistentry>
     43
     44    </variablelist>
    3245
    3346    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    6262    --with-tlib=ncurses</userinput></screen>
    6363
     64    <variablelist os="f">
     65      <title>The meaning of the new configure options:</title>
     66
     67      <varlistentry>
     68        <term><parameter>--enable-multibyte</parameter></term>
     69        <listitem>
     70          <para>This optional but highly recommended switch enables support
     71          for editing files in multibyte character encodings. This is needed
     72          if using a locale with a multibyte character set. This switch is
     73          also helpful to be able to edit text files initially created in
     74          Linux distributions like Fedora that use UTF-8 as a default
     75          character set.</para>
     76        </listitem>
     77      </varlistentry>
     78
     79      <varlistentry>
     80        <term><parameter>--enable-gui=no --disable-gtktest --disable-xim --with-features=normal --disable-gpm --without-x --disable-netbeans</parameter></term>
     81        <listitem>
     82          <para>These options prevent Vim from trying to link to libraries
     83          that might be on the host but won't exist inside the temporary
     84          build environment.</para>
     85        </listitem>
     86      </varlistentry>
     87
     88      <varlistentry>
     89        <term><parameter>--with-tlib=ncurses</parameter></term>
     90        <listitem>
     91          <para>Tells Vim to use Ncurses as its terminal library.</para>
     92        </listitem>
     93      </varlistentry>
     94
     95    </variablelist>
     96
    6497    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6598    href="../../final-system/common/vim.xml"
    … …  
    74107    xpointer="xpointer(//*[@os='j'])"/>
    75108
    76     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77     href="../../final-system/common/vim.xml"
    78     xpointer="xpointer(//*[@os='k'])"/>
     109<screen os="k"><userinput>make install</userinput></screen>
    79110
    80111    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    88119
    89120<screen os="tv2"><userinput>cat &gt; /tools/etc/vimrc &lt;&lt; "EOF"
    90 <literal>" Begin /etc/vimrc
     121<literal>" Begin /tools/etc/vimrc
    91122
    92123set nocompatible
    … …  
    95126syntax on
    96127
    97 " End /etc/vimrc</literal>
     128" End /tools/etc/vimrc</literal>
    98129EOF</userinput></screen>
    99130

  • BOOK/temp-system/common/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"
Note: See TracChangeset for help on using the changeset viewer.