Changeset 3dc9543


Ignore:
Timestamp:
02/18/2014 07:16:55 AM (10 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
aa976fe
Parents:
177aee0
Message:

Change kmod instructions to allow installation of man pages.
Numerous whitespace fixes.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10480 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
24 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r177aee0 r3dc9543  
    3737-->
    3838    <listitem>
     39      <para>2014-02-18</para>
     40      <itemizedlist>
     41        <listitem>
     42          <para>[bdubbs] - Change kmod instructions to allow
     43          installation of man pages.  Fixes
     44          <ulink url="&lfs-ticket-root;3502">#3502</ulink>.</para>
     45        </listitem>
     46      </itemizedlist>
     47    </listitem>
     48
     49    <listitem>
    3950      <para>2014-02-16</para>
    4051      <itemizedlist>

  • chapter05/binutils-pass1.xml

    r177aee0 r3dc9543  
    7373    <para>Now prepare Binutils for compilation:</para>
    7474
    75 <screen><userinput remap="configure">../binutils-&binutils-version;/configure   \
     75<screen><userinput remap="configure">../binutils-&binutils-version;/configure     \
    7676    --prefix=/tools            \
    7777    --with-sysroot=$LFS        \

  • chapter05/binutils-pass2.xml

    r177aee0 r3dc9543  
    5454AR=$LFS_TGT-ar                 \
    5555RANLIB=$LFS_TGT-ranlib         \
    56 ../binutils-&binutils-version;/configure   \
     56../binutils-&binutils-version;/configure     \
    5757    --prefix=/tools            \
    5858    --disable-nls              \

  • chapter05/expect.xml

    r177aee0 r3dc9543  
    5252    <para>Now prepare Expect for compilation:</para>
    5353
    54 <screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \
    55   --with-tclinclude=/tools/include</userinput></screen>
     54<screen><userinput remap="configure">./configure --prefix=/tools       \
     55            --with-tcl=/tools/lib \
     56            --with-tclinclude=/tools/include</userinput></screen>
    5657
    5758    <variablelist>

  • chapter05/gcc-pass2.xml

    r177aee0 r3dc9543  
    7878  cp -uv $file{,.orig}
    7979  sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&amp;@g' \
    80   -e 's@/usr@/tools@g' $file.orig &gt; $file
     80      -e 's@/usr@/tools@g' $file.orig &gt; $file
    8181  echo '
    8282#undef STANDARD_STARTFILE_PREFIX_1

  • chapter05/libstdc++.xml

    r177aee0 r3dc9543  
    5757
    5858<screen><userinput remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \
    59     --host=$LFS_TGT                      \
    60     --prefix=/tools                      \
    61     --disable-multilib                   \
    62     --disable-shared                     \
    63     --disable-nls                        \
    64     --disable-libstdcxx-threads          \
    65     --disable-libstdcxx-pch              \
     59    --host=$LFS_TGT                 \
     60    --prefix=/tools                 \
     61    --disable-multilib              \
     62    --disable-shared                \
     63    --disable-nls                   \
     64    --disable-libstdcxx-threads     \
     65    --disable-libstdcxx-pch         \
    6666    --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
    6767

  • chapter05/stripping.xml

    r177aee0 r3dc9543  
    1717
    1818<screen><userinput>strip --strip-debug /tools/lib/*
    19 strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
     19/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
    2020
    2121  <para>These commands will skip a number of files, reporting that it does not
    22   recognize their file format. Most of these are scripts instead of binaries.</para>
     22  recognize their file format. Most of these are scripts instead of binaries.
     23  Also use the system strip command to include the strip binary in /tools.</para>
    2324
    2425  <para>Take care <emphasis>not</emphasis> to use

  • chapter06/creatingdirs.xml

    r177aee0 r3dc9543  
    2323mkdir -v  /usr/libexec
    2424mkdir -pv /usr/{,local/}share/man/man{1..8}
     25
    2526case $(uname -m) in
    26  x86_64) ln -sv lib /lib64 &amp;&amp; ln -sv lib /usr/lib64 &amp;&amp; ln -sv lib /usr/local/lib64 ;;
     27 x86_64) ln -sv lib /lib64     &amp;&amp;
     28         ln -sv lib /usr/lib64 &amp;&amp;
     29         ln -sv lib /usr/local/lib64 ;;
    2730esac
     31
    2832mkdir -v /var/{log,mail,spool}
    2933ln -sv /run /var/run

  • chapter06/db.xml

    r177aee0 r3dc9543  
    274274
    275275      <varlistentry id="libdb">
    276         <term><filename class="libraryfile">libdb.{so,a}</filename></term>
     276        <term><filename class="libraryfile">libdb.{a,so}</filename></term>
    277277        <listitem>
    278278          <para>Contains functions to manipulate database files from C
    … …  
    285285
    286286      <varlistentry id="libdb_cxx">
    287         <term><filename class="libraryfile">libdb_cxx.{so,a}</filename></term>
     287        <term><filename class="libraryfile">libdb_cxx.{a,so}</filename></term>
    288288        <listitem>
    289289          <para>Contains functions to manipulate database files from C++

  • chapter06/findutils.xml

    r177aee0 r3dc9543  
    4646    <para>Prepare Findutils for compilation:</para>
    4747
    48 <screen><userinput remap="configure">./configure --prefix=/usr                   \
    49             --localstatedir=/var/lib/locate</userinput></screen>
     48<screen><userinput remap="configure">./configure --prefix=/usr --localstatedir=/var/lib/locate</userinput></screen>
    5049
    5150    <variablelist>

  • chapter06/flex.xml

    r177aee0 r3dc9543  
    4848    <para>Prepare Flex for compilation:</para>
    4949
    50 <screen><userinput remap="configure">./configure --prefix=/usr \
    51             --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
     50<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
    5251
    5352    <para>Compile the package:</para>
    … …  
    9897      <seglistitem>
    9998        <seg>flex, flex++ (link to flex), and lex</seg>
    100         <seg>libfl.{so,a} and libfl_pic.{so.a}</seg>
     99        <seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
    101100        <seg>/usr/share/doc/flex-&flex-version;</seg>
    102101      </seglistitem>

  • chapter06/gcc.xml

    r177aee0 r3dc9543  
    7171    <para>Prepare GCC for compilation:</para>
    7272
    73 <screen><userinput remap="configure">SED=sed                                            \
    74 ../gcc-&gcc-version;/configure --prefix=/usr               \
    75                        --enable-shared             \
    76                        --enable-threads=posix      \
    77                        --enable-__cxa_atexit       \
    78                        --enable-clocale=gnu        \
    79                        --enable-languages=c,c++    \
    80                        --disable-multilib          \
    81                        --disable-bootstrap         \
    82                        --with-system-zlib</userinput></screen>
     73<screen><userinput remap="configure">SED=sed                          \
     74../gcc-&gcc-version;/configure           \
     75     --prefix=/usr               \
     76     --enable-shared             \
     77     --enable-threads=posix      \
     78     --enable-__cxa_atexit       \
     79     --enable-clocale=gnu        \
     80     --enable-languages=c,c++    \
     81     --disable-multilib          \
     82     --disable-bootstrap         \
     83     --with-system-zlib</userinput></screen>
    8384
    8485    <para>Note that for other languages, there are some prerequisites that

  • chapter06/gdbm.xml

    r177aee0 r3dc9543  
    8484      <seglistitem>
    8585        <seg>testgdbm</seg>
    86         <seg>libgdbm.{so,a} and libgdbm_compat.{so,a}</seg>
     86        <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
    8787      </seglistitem>
    8888    </segmentedlist>

  • chapter06/gettext.xml

    r177aee0 r3dc9543  
    4646    <para>Prepare Gettext for compilation:</para>
    4747
    48 <screen><userinput remap="configure">./configure --prefix=/usr \
    49             --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
     48<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
    5049
    5150    <para>Compile the package:</para>

  • chapter06/glibc.xml

    r177aee0 r3dc9543  
    7474    <para>Prepare Glibc for compilation:</para>
    7575
    76 <screen><userinput remap="configure">../glibc-&glibc-version;/configure          \
    77     --prefix=/usr                \
    78     --disable-profile            \
    79     --enable-kernel=&min-kernel;       \
     76<screen><userinput remap="configure">../glibc-&glibc-version;/configure    \
     77    --prefix=/usr          \
     78    --disable-profile      \
     79    --enable-kernel=&min-kernel; \
    8080    --enable-obsolete-rpc</userinput></screen>
    8181

  • chapter06/kmod.xml

    r177aee0 r3dc9543  
    4747            --bindir=/bin          \
    4848            --sysconfdir=/etc      \
    49             --disable-manpages     \
    5049            --with-rootlibdir=/lib \
    5150            --with-xz              \
    … …  
    6160        </listitem>
    6261      </varlistentry>
    63 
     62<!--
    6463      <varlistentry>
    65         <term><parameter>--disable-manpages</parameter></term>
     64        <term><parameter>- -disable-manpages</parameter></term>
    6665        <listitem>
    6766          <para>This option prevents the man pages from being built, as they
    … …  
    7069        </listitem>
    7170      </varlistentry>
    72 
     71-->
    7372      <varlistentry>
    7473        <term><parameter>--with-rootlibdir=/lib</parameter></term>

  • chapter06/pcre.xml

    r177aee0 r3dc9543  
    107107      <seglistitem>
    108108        <seg>pcregrep, pcretest, and pcre-config</seg>
    109         <seg>libpcre.{so,a}, libpcrecpp.{so,a} and libpcreposix.{so,a}</seg>
     109        <seg>libpcre.{a,so}, libpcrecpp.{a,so} and libpcreposix.{a,so}</seg>
    110110        <seg>/usr/share/doc/pcre-&pcre-version;</seg>
    111111      </seglistitem>

  • chapter06/procps.xml

    r177aee0 r3dc9543  
    7171
    7272<screen><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
    73 
    7473make check</userinput></screen>
    7574

  • chapter06/readline.xml

    r177aee0 r3dc9543  
    9191    <para>If desired, install the documentation:</para>
    9292
    93 <screen><userinput remap="install">mkdir   -v       /usr/share/doc/readline-&readline-version;
    94 install -v -m644 doc/*.{ps,pdf,html,dvi} \
    95                  /usr/share/doc/readline-&readline-version;</userinput></screen>
     93<screen><userinput remap="install">mkdir   -v /usr/share/doc/readline-&readline-version;
     94install -v -m644 doc/*.{ps,pdf,html,dvi} /usr/share/doc/readline-&readline-version;</userinput></screen>
    9695
    9796  </sect2>

  • chapter06/shadow.xml

    r177aee0 r3dc9543  
    7070      <para>If you chose to build Shadow with Cracklib support, run the following:</para>
    7171
    72 <screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' \
    73     etc/login.defs</userinput></screen>
     72<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
    7473    </note>
    7574

  • chapter06/strippingagain.xml

    r177aee0 r3dc9543  
    3333  <para>Then reenter it with:</para>
    3434
    35 <screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
     35<screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i            \
    3636    HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
    37     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
     37    PATH=/bin:/usr/bin:/sbin:/usr/sbin   \
    3838    /tools/bin/bash --login</userinput></screen>
    3939
    … …  
    4141
    4242<screen><userinput>/tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
    43   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
     43    -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
    4444
    4545  <para>A large number of files will be reported as having their file

  • chapter06/util-linux.xml

    r177aee0 r3dc9543  
    5151
    5252<screen><userinput remap="pre">sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
    53      $(grep -rl '/etc/adjtime' .)
     53          $(grep -rl '/etc/adjtime' .)
    5454
    5555mkdir -pv /var/lib/hwclock</userinput></screen>

  • chapter06/xz.xml

    r177aee0 r3dc9543  
    4747    <para>Prepare Xz for compilation with:</para>
    4848
    49 <screen><userinput remap="configure">./configure --prefix=/usr \
    50             --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
     49<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
    5150
    5251    <para>Compile the package:</para>

  • general.ent

    r177aee0 r3dc9543  
    1 <!ENTITY version         "SVN-20140216">
    2 <!ENTITY releasedate     "February 16, 2015">
     1<!ENTITY version         "SVN-20140218">
     2<!ENTITY releasedate     "February 18, 2015">
    33<!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
    44<!ENTITY milestone       "7.5">
Note: See TracChangeset for help on using the changeset viewer.