Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

Location:
BOOK/temp-system/common
Files:
2 added
1 deleted
17 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    rec008670 r229ed25  
    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-->
     34
    2535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2636    href="../../final-system/common/binutils.xml"
    … …  
    3545    xpointer="xpointer(//*[@os='i'])"/>
    3646
    37 <screen os="j"><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
     47<screen os="j"><userinput>../binutils-&binutils-dir;/configure --prefix=/tools \
    3848    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
    3949    --with-lib-path=/tools/lib --disable-nls --enable-shared \

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

    rec008670 r229ed25  
    2323    <title>Installation of Bison</title>
    2424
     25    <para os='s1'>Apply a <command>sed</command> which disables the building of <filename>bison.help</filename> when cross-compiling.</para>
     26
     27<screen os='s2'><userinput>cp -v Makefile.in{,.orig}
     28sed '/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'])"/>
     36
    2537    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2638    href="../../final-system/common/bison.xml"
    2739    xpointer="xpointer(//*[@os='a'])"/>
    2840
    29 <screen os="ca"><userinput>./configure --prefix=/tools \
    30     --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     41<screen os="ca"><userinput>M4=m4 ./configure --prefix=/tools \
     42    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     43    --cache-file=config.cache</userinput></screen>
    3144
    3245    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    3434  method.</para>
    3535
    36   <para>To chroot, you will also need a Linux Kernel-2.6.x (having been
    37   compiled with GCC-3.0 or greater). The reason for the kernel version
    38   requirement is that, without it, thread-local storage support in Binutils
    39   will not be built and the Native POSIX Threading Library (NPTL) test suite
    40   will segfault.</para>
     36  <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
     37  (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
     39  for the smallest version of the Linux kernel expected to be supported.</para>
    4140
    4241  <para>To check your kernel version, run <command>cat /proc/version</command>
    43   - if it does not say that you are running a 2.6.2 or later Linux kernel,
    44   compiled with GCC 3.0 or later, you cannot chroot.</para>
     42  - if it does not say that you are running a 2.6.32 or later Linux kernel,
     43  compiled with GCC 4.1.2 or later, you cannot chroot.</para>
    4544
    4645  <para os="e">For the boot method, follow <xref linkend="chapter-boot"/>.</para>

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-temp-system-ppl" role="wrap">
    9   <?dbhtml filename="ppl.html"?>
     8<sect1 id="ch-temp-system-cloog" role="wrap">
     9  <?dbhtml filename="cloog.html"?>
    1010
    11   <title>PPL-&ppl-version;</title>
     11  <title>CLooG &cloog-version;</title>
    1212
    13   <indexterm zone="ch-temp-system-ppl">
    14     <primary sortas="a-PPL">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/ppl.xml"
     19  href="../../final-system/common/cloog.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of PPL</title>
     23    <title>Installation of CLooG</title>
    2424
    25     <para os="a">Prepare PPL for compilation:</para>
     25    <para os="a">Prepare CLooG for compilation:</para>
    2626
    2727<screen os="b"><userinput>./configure --prefix=/tools \
    2828    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    29     --enable-interfaces="c,cxx" --enable-shared --disable-optimization \
    30     --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
     29    --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
    3130
    32     <para os="bp1">When PPL is cross-compiled, it does not check whether
    33     GMP was compiled with support for exceptions, and simply assumes it was not.
    34     This assumption is incorrect, so we will fix that:</para>
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     32    href="../../final-system/common/cloog.xml"
     33    xpointer="xpointer(//*[@os='s1'])"/>
    3534
    36 <screen os="bp2"><userinput>echo '#define PPL_GMP_SUPPORTS_EXCEPTIONS 1' >> confdefs.h</userinput></screen>
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     36    href="../../final-system/common/cloog.xml"
     37    xpointer="xpointer(//*[@os='s2'])"/>
    3738
    3839    <para os="c">Compile the package:</para>
    … …  
    5051
    5152    <para>Details on this package are located in <xref
    52     linkend="contents-ppl" role="."/></para>
     53    linkend="contents-cloog" role="."/></para>
    5354
    5455  </sect2>

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

    rec008670 r229ed25  
    2323    <title>Installation of Coreutils</title>
    2424
    25     <para os="aa">The following command updates the timestamps on the uname
    26     and hostname man pages so that the Makefile does not attempt to regenerate
    27     them:</para>
    28 
    29 <screen os="ab"><userinput>touch man/uname.1 man/hostname.1</userinput></screen>
    30 
    3125    <para os="ba">Configure can not properly determine how to get free space
    3226    when cross-compiling - as a result, the <command>df</command> program will
    … …  
    3933EOF</userinput></screen>
    4034
     35    <para os="p1">Apply a patch to not generate manpages :</para>
     36
     37<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-noman-patch;</userinput></screen>
     38
    4139    <para os="bd">Prepare Coreutils for compilation:</para>
    4240
    … …  
    4442    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4543    --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
     44
     45    <variablelist os="be1">
     46      <title>The meaning of the new configure option:</title>
     47
     48      <varlistentry>
     49        <term><parameter>--enable-install-program=hostname</parameter></term>
     50        <listitem>
     51          <para>Tells Coreutils to install <command>hostname</command>,
     52          which is needed for the Perl testsuite.</para>
     53        </listitem>
     54      </varlistentry>
     55
     56    </variablelist>
     57
     58    <para os="s1">Apply a sed to allow completion of the build:</para>
     59
     60<screen os="s2"><userinput>cp -v Makefile{,.orig}
     61sed -e 's/^#run_help2man\|^run_help2man/#&amp;/' \
     62  -e 's/^\##run_help2man/run_help2man/' Makefile.orig > Makefile</userinput></screen>
    4663
    4764   <para os="bf">Compile the package:</para>

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

    rec008670 r229ed25  
    2323    <title>Installation of Flex</title>
    2424
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/flex.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/flex.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    32 
    33     <para os="t3">When Cross Compiling the configure script
    34     does not determine the correct values for the following,
     25    <para os="t3">When cross compiling, the <command>configure</command>
     26    script does not determine the correct values for the following.
    3527    Set the values manually:</para>
    3628
    … …  
    4436    xpointer="xpointer(//*[@os='a'])"/>
    4537
    46 <screen os="cb"><userinput>./configure --prefix=/tools \
     38<screen os="cb"><userinput>M4=m4 ./configure --prefix=/tools \
    4739    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4840    --cache-file=config.cache</userinput></screen>

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

    rec008670 r229ed25  
    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}
     28sed -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>
    2430
    2531    <para os="a">Prepare Gawk for compilation:</para>

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

    rec008670 r229ed25  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../cross-tools/common/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/common/gcc-static.xml"
     30    href="../../final-system/common/gcc.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    3232
    … …  
    4747    xpointer="xpointer(//*[@os='ah'])"/>
    4848
    49     <para os="cf">Also, we need to set the directory searched by the fixincludes
    50     process for system headers, so it won't look at the host's headers:</para>
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../../final-system/common/gcc.xml"
     51    xpointer="xpointer(//*[@os='fix1'])"/>
    5152
    52 <screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
    53 sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
    54     gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54    href="../../final-system/common/gcc.xml"
     55    xpointer="xpointer(//*[@os='fix2'])"/>
    5556
    5657    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    7172<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
    7273  --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
    73   --with-local-prefix=/tools --enable-long-long --enable-c99 \
    74   --enable-shared --enable-threads=posix --enable-__cxa_atexit \
    75   --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch \
    76   --disable-multilib</userinput></screen>
     74  --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
     75  --enable-c99 --enable-shared --enable-threads=posix --disable-multilib \
     76  --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 \
     80  --with-native-system-header-dir=/tools/include --disable-libssp \
     81  --disable-install-libiberty --enable-checking=release \
     82  --enable-libstdcxx-time</userinput></screen>
    7783
    7884    <variablelist os="cl">
    … …  
    9096    </variablelist>
    9197
    92     <para os="ts1">The following will prevent GCC from looking in the wrong
     98    <para os="s1">The following will prevent GCC from looking in the wrong
    9399    directories for headers and libraries:</para>
    94100
    95 <screen os="ts2"><userinput>cp -v Makefile{,.orig}
    96 sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
    97     Makefile.orig &gt; Makefile</userinput></screen>
     101<screen os="s2"><userinput>cp -v Makefile{,.orig}
     102sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:/tools:/cross-tools:g" \
     103    Makefile.orig > Makefile</userinput></screen>
    98104
    99105    <para os="cm">Compile the package:</para>

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

    rec008670 r229ed25  
    3535    <para os="a">Prepare GMP for compilation:</para>
    3636
    37 <screen os="b"><userinput>HOST_CC=gcc CPPFLAGS=-fexceptions ./configure --prefix=/tools \
     37<screen os="b"><userinput>HOST_CC=gcc ./configure --prefix=/tools \
    3838    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3939    --enable-cxx</userinput></screen>

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

    rec008670 r229ed25  
    2323    <title>Installation of Grep</title>
    2424
    25     <para os="t1">When Cross Compiling the configure script
    26     does not determine the correct values for the following,
    27     Set the values manually:</para>
    28 
    29 <screen os="t2"><userinput>cat &gt; config.cache &lt;&lt; EOF
    30 ac_cv_func_malloc_0_nonnull=yes
    31 ac_cv_func_realloc_0_nonnull=yes
    32 EOF</userinput></screen>
    33 
    3425    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3526    href="../../final-system/common/grep.xml"
    … …  
    3829<screen os="ca"><userinput>./configure --prefix=/tools \
    3930    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    40     --disable-perl-regexp --without-included-regex \
    41     --cache-file=config.cache</userinput></screen>
     31    --without-included-regex</userinput></screen>
    4232
    4333    <variablelist os="cb">
    44       <title>The meaning of the configure options:</title>
     34      <title>The meaning of the new configure option:</title>
    4535
    4636      <varlistentry>
    47         <term><parameter>--disable-perl-regexp</parameter></term>
     37        <term><parameter>--without-included-regex</parameter></term>
    4838        <listitem>
    49           <para>This ensures that the <command>grep</command> program
    50           does not get linked against a Perl Compatible Regular Expression
    51           (PCRE) library that may be present on the host but will not be
    52           available when building the final system.</para>
     39          <para>When cross-compiling, Grep's <command>configure</command>
     40          assumes there is no usable <filename>regex.h</filename> installed and
     41          instead uses the one included with Grep. This switch forces the use of
     42          the regex functions from EGLIBC.</para>
    5343        </listitem>
    5444      </varlistentry>

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

    rec008670 r229ed25  
    3030gl_cv_func_mbrtowc_incomplete_state=yes
    3131gl_cv_func_mbrtowc_sanitycheck=yes
    32 gl_cv_func_mbrtowc_null_arg=yes
     32gl_cv_func_mbrtowc_null_arg1=yes
     33gl_cv_func_mbrtowc_null_arg2=yes
    3334gl_cv_func_mbrtowc_retval=yes
    3435gl_cv_func_mbrtowc_nul_retval=yes

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

    rec008670 r229ed25  
    2525    <para os="a">Prepare MPC for compilation:</para>
    2626
    27 <screen os="b"><userinput>EGREP="grep -E" ./configure --prefix=/tools \
     27<screen os="b"><userinput>./configure --prefix=/tools \
    2828    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    2929

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

    rec008670 r229ed25  
    2323    <title>Installation of MPFR</title>
    2424
     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'])"/>
     32
    2533    <para os="a">Prepare MPFR for compilation:</para>
    2634
    2735<screen os="b"><userinput>./configure --prefix=/tools \
    2836    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    29     --enable-shared --with-gmp=/tools</userinput></screen>
     37    --enable-shared</userinput></screen>
    3038
    3139    <para os="c">Compile the package:</para>

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

    rec008670 r229ed25  
    3737
    3838    <variablelist os="c">
    39       <title>The meaning of the configure options:</title>
     39      <title>The meaning of the new configure options:</title>
    4040
    4141      <varlistentry>

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

    rec008670 r229ed25  
    2323    <title>Installation of Patch</title>
    2424
    25     <para os="cc1">When cross-compiling configure cannot properly detect the
    26     existance of certain features. Override this behaviour:</para>
    27 
    28 <screen os="cc2"><userinput>echo "ac_cv_func_strnlen_working=yes" > config.cache</userinput></screen>
    29 
    3025    <para os="a">Prepare Patch for compilation:</para>
    3126
    3227<screen os="b"><userinput>./configure --prefix=/tools \
    33     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    34     --cache-file=config.cache</userinput></screen>
     28    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3529
    3630    <para os="c">Compile the package:</para>

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

    rec008670 r229ed25  
    3030gl_cv_func_btowc_eof=yes
    3131ac_cv_func_malloc_0_nonnull=yes
    32 ac_cv_func_realloc_0_nonnull=yes
    3332gl_cv_func_mbrtowc_incomplete_state=yes
    3433gl_cv_func_mbrtowc_nul_retval=yes
    35 gl_cv_func_mbrtowc_null_arg=yes
     34gl_cv_func_mbrtowc_null_arg1=yes
     35gl_cv_func_mbrtowc_null_arg2=yes
    3636gl_cv_func_mbrtowc_retval=yes
    3737gl_cv_func_wcrtomb_retval=yes

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

    rec008670 r229ed25  
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen os="d"><userinput>make -C tools/gnulib/lib
    37 make -C tools
    38 make</userinput></screen>
     36<screen os="d"><userinput>make</userinput></screen>
    3937
    4038    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    3232
    33     <para os="s1">The configure script has a single hard coded test that
    34     cannot be bypassed with a cache entry. Disable this test with the
    35     following command:</para>
    36 
    37 <screen os="s2"><userinput>sed -i "/using uint32_t/s/as_fn_error/#&amp;/" src/auto/configure</userinput></screen>
    38 
    3933    <para os="c1">The <command>configure</command> script is full of logic
    4034    that aborts at the first sign of cross compiling. Work around this by
    … …  
    4741vim_cv_stat_ignores_slash=no
    4842vim_cv_terminfo=yes
    49 vim_cv_tgent=zero
    5043vim_cv_toupper_broken=no
    5144vim_cv_tty_group=world
    52 ac_cv_sizeof_int=4
    53 ac_cv_sizeof_long=4
    54 ac_cv_sizeof_time_t=4
    55 ac_cv_sizeof_off_t=4
    5645EOF</userinput></screen>
    5746
Note: See TracChangeset for help on using the changeset viewer.