Changeset 4bda698


Ignore:
Timestamp:
02/06/2021 06:41:29 AM (4 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
efa633e
Parents:
f695e02
Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12130 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    rf695e02 r4bda698  
    6161          <para>[pierre] - Replace the relinked libctf (which may incorrectly
    6262          link against libz from the host distribution) with the one that
    63           was linked during "make" in binutils-pass2.</para>
     63          was linked during "make" in binutils-pass2. Thanks to Xi Ruoyao
     64          for the fix.</para>
    6465        </listitem>
    6566        <listitem>

  • chapter06/file.xml

    rf695e02 r4bda698  
    5252<screen><userinput remap="pre">mkdir build
    5353pushd build
    54   ../configure
     54  ../configure --disable-bzlib      \
     55               --disable-libseccomp \
     56               --disable-xzlib      \
     57               --disable-zlib
    5558  make
    5659popd</userinput></screen>
     60
     61    <variablelist>
     62      <title>The meaning of the new configure option:</title>
     63
     64      <varlistentry>
     65        <term><parameter>--disable-*</parameter></term>
     66        <listitem>
     67          <para>The configuration script attempts to use some packages from
     68          the host distribution if the corresponding library files exist.
     69          It may cause compilation failure if a library file exists, but
     70          the corresponding header files do not.  These options prevent
     71          using these unneeded capabilities from the host.</para>
     72        </listitem>
     73      </varlistentry>
     74    </variablelist>
    5775
    5876    <para>Prepare File for compilation:</para>

  • chapter07/util-linux.xml

    rf695e02 r4bda698  
    4242    <title>Installation of Util-linux</title>
    4343
    44     <para>First create a directory
    45     to enable storage for the <command>hwclock</command> program:</para>
     44    <para>The FHS recommends using the <filename
     45    class="directory">/var/lib/hwclock</filename> directory instead of the
     46    usual <filename class="directory">/etc</filename> directory as the
     47    location for the <filename>adjtime</filename> file. Create this directory
     48    with:</para>
    4649
    4750<screen><userinput remap="pre">mkdir -pv /var/lib/hwclock</userinput></screen>

  • chapter08/binutils.xml

    rf695e02 r4bda698  
    181181<screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
    182182
     183    <para>Remove useless static libraries:</para>
     184
     185<screen><userinput remap="install">rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.a</userinput></screen>
     186
    183187  </sect2>
    184188
    … …  
    194198        <seg>addr2line, ar, as, c++filt, dwp, elfedit, gprof, ld, ld.bfd, ld.gold, nm,
    195199        objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
    196         <seg>libbfd.{a,so}, libctf.{a,so}, libctf-nobfd.{a,so}, and libopcodes.{a,so}</seg>
     200        <seg>libbfd.so, libctf.so, libctf-nobfd.so, and libopcodes.so</seg>
    197201        <seg>/usr/lib/ldscripts</seg>
    198202      </seglistitem>

  • chapter08/bzip2.xml

    rf695e02 r4bda698  
    9696ln -sv bzip2 /bin/bzcat</userinput></screen>
    9797
     98    <para>Remove an useless static library:</para>
     99
     100<screen><userinput remap="install">rm -fv /usr/lib/libbz2.a</userinput></screen>
     101
    98102  </sect2>
    99103
    … …  
    164168        bzdiff), bzdiff, bzegrep (link to bzgrep), bzfgrep (link to bzgrep),
    165169        bzgrep, bzip2, bzip2recover, bzless (link to bzmore), and bzmore</seg>
    166         <seg>libbz2.{a,so}</seg>
     170        <seg>libbz2.so</seg>
    167171        <seg>/usr/share/doc/bzip2-&bzip2-version;</seg>
    168172      </seglistitem>

  • chapter08/coreutils.xml

    rf695e02 r4bda698  
    7878        <term><command>autoreconf</command></term>
    7979        <listitem>
    80           <para>This command updates generated configuration files
    81           consistent with the latest version of automake.
    82           </para>
     80          <para>The patch for internationalization has modified the
     81          building system of the package, so the configuration files have
     82          to be regenerated.</para>
    8383        </listitem>
    8484      </varlistentry>

  • chapter08/dbus.xml

    rf695e02 r4bda698  
    4949    <para>Prepare D-Bus for compilation:</para>
    5050
    51 <screen><userinput remap="configure">./configure --prefix=/usr                       \
    52             --sysconfdir=/etc                   \
    53             --localstatedir=/var                \
    54             --disable-static                    \
    55             --disable-doxygen-docs              \
    56             --disable-xml-docs                  \
     51<screen><userinput remap="configure">./configure --prefix=/usr                        \
     52            --sysconfdir=/etc                    \
     53            --localstatedir=/var                 \
     54            --disable-static                     \
     55            --disable-doxygen-docs               \
     56            --disable-xml-docs                   \
    5757            --docdir=/usr/share/doc/dbus-&dbus-version; \
    58             --with-console-auth-dir=/run/console</userinput></screen>
     58            --with-console-auth-dir=/run/console \
     59            --with-system-pid-file=/run/dbus/pid \
     60            --with-system-socket=/run/dbus/system_bus_socket</userinput></screen>
    5961
    6062    <variablelist>
    … …  
    6668          <para>This specifies the location of the ConsoleKit authorization
    6769          directory.</para>
     70        </listitem>
     71      </varlistentry>
     72
     73      <varlistentry>
     74        <term>
     75          <parameter>--with-system-pid-file=/run/dbus/pid</parameter> and
     76          <parameter>--with-system-socket=/run/dbus/system_bus_socket</parameter>
     77        </term>
     78        <listitem>
     79          <para>These set the location of the PID file and the system bus socket
     80          to be in <filename class="directory">/run</filename>, instead of
     81          deprecated <filename class="directory">/var/run</filename>.</para>
    6882        </listitem>
    6983      </varlistentry>
    … …  
    96110
    97111<screen><userinput remap="install">ln -sfv /etc/machine-id /var/lib/dbus</userinput></screen>
    98 
    99     <para>Move the socket file to /run instead of the deprecated
    100     /var/run:</para>
    101 
    102  <screen><userinput remap="install">sed -i 's:/var/run:/run:' /lib/systemd/system/dbus.socket</userinput></screen>
    103112
    104113  </sect2>

  • chapter08/e2fsprogs.xml

    rf695e02 r4bda698  
    123123<screen><userinput remap="install">make install</userinput></screen>
    124124
    125     <para>Make the installed static libraries writable so debugging symbols can
    126     be removed later:</para>
    127 
    128 <screen><userinput remap="install">chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen>
     125    <para>Remove useless static libraries:</para>
     126
     127<screen><userinput remap="install">rm -fv /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen>
    129128
    130129    <para>This package installs a gzipped

  • chapter08/flex.xml

    rf695e02 r4bda698  
    5454    <para>Prepare Flex for compilation:</para>
    5555
    56 <!-- <screen><userinput remap="configure">HELP2MAN=/tools/bin/true \ -->
    57 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
     56<screen><userinput remap="configure">./configure --prefix=/usr \
     57            --docdir=/usr/share/doc/flex-&flex-version; \
     58            --disable-static</userinput></screen>
    5859
    5960    <para>Compile the package:</para>

  • chapter08/libtool.xml

    rf695e02 r4bda698  
    6868
    6969<screen><userinput remap="install">make install</userinput></screen>
     70
     71    <!-- dev: - -disable-static works but causes additional test failures
     72              so we manually remove the static library -->
     73
     74    <para>Remove an useless static library:</para>
     75
     76<screen><userinput remap="install">rm -fv /usr/lib/libltdl.a</userinput></screen>
    7077
    7178  </sect2>

  • chapter08/ncurses.xml

    rf695e02 r4bda698  
    4141  <sect2 role="installation">
    4242    <title>Installation of Ncurses</title>
    43 
    44     <para>Don't install a static library that is not handled by configure:</para>
    45 
    46 <screen><userinput remap="pre">sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in</userinput></screen>
    4743
    4844    <para>Prepare Ncurses for compilation:</para>
    … …  
    133129echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
    134130ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
     131
     132    <para>Remove a static library that is not handled by configure:</para>
     133
     134<screen><userinput remap="install">rm -fv /usr/lib/libncurses++w.a</userinput></screen>
    135135
    136136    <para>If desired, install the Ncurses documentation:</para>
    … …  
    279279           libmenuw.so,
    280280           libncursesw.so,
    281            libncurses++w.a,
    282281           libpanelw.so, and their non-wide-character counterparts without "w"
    283282              in the library names.</seg>

  • chapter08/python.xml

    rf695e02 r4bda698  
    9595    <para>Install the package:</para>
    9696
    97 <screen><userinput remap="install">make install
    98 chmod -v 755 /usr/lib/libpython&python-minor;.so
    99 chmod -v 755 /usr/lib/libpython3.so
    100 ln -sfv pip&python-minor; /usr/bin/pip3</userinput></screen>
    101 
    102     <variablelist>
    103       <title>The meaning of the install commands:</title>
    104 <!-- ======  Change 8m if Python minor version changes ======= -->
    105     <varlistentry>
    106       <term><command>chmod -v 755 /usr/lib/libpython{&python-minor;,3}.so</command></term>
    107       <listitem>
    108         <para>Fix permissions for libraries to be consistent with other
    109         libraries.</para>
    110       </listitem>
    111     </varlistentry>
    112 
    113     </variablelist>
     97<screen><userinput remap="install">make install</userinput></screen>
    11498
    11599    <para>If desired, install the preformatted documentation:</para>

  • chapter08/revisedchroot.xml

    rf695e02 r4bda698  
    3737  linkend="ch-tools-kernfsmount"/>.</para>
    3838
    39   <para>There were several static libraries that were not suppressed earlier
    40   in the chapter in order to satisfy the regression tests in several packages. These
    41   libraries are from binutils, bzip2, e2fsprogs, flex, libtool, and zlib.  If desired,
    42   remove them now:</para>
    43 
    44 <screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
    45 rm -f /usr/lib/libctf{,-nobfd}.a
    46 rm -f /usr/lib/libbz2.a
    47 rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
    48 rm -f /usr/lib/libltdl.a
    49 rm -f /usr/lib/libfl.a
    50 rm -f /usr/lib/libz.a</userinput><userinput arch="ml_32,ml_all">
    51 rm -f &usr-lib-m32;/libbz2.a
    52 rm -f &usr-lib-m32;/libltdl.a
    53 rm -f &usr-lib-m32;/libz.a</userinput><userinput arch="ml_x32,ml_all">
    54 rm -f &usr-lib-mx32;/libbz2.a
    55 rm -f &usr-lib-mx32;/libltdl.a
    56 rm -f &usr-lib-mx32;/libz.a</userinput></screen>
    57 
    5839  <para>There are also several files installed in the /usr/lib and /usr/libexec
    5940  directories with a file name extension of .la. These are "libtool archive"

  • chapter08/systemd.xml

    rf695e02 r4bda698  
    213213<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
    214214
     215    <para>Remove an useless directory:</para>
     216
     217<screen><userinput remap="install">rm -rf /usr/lib/pam.d</userinput></screen>
     218
    215219    <para>Create the <filename>/etc/machine-id</filename> file needed by
    216220    <command>systemd-journald</command>:</para>
    … …  
    229233<screen><userinput remap="adjust">systemctl disable systemd-time-wait-sync.service</userinput></screen>
    230234
     235<!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.
     236          If it causes any trouble, we can add this back and also copy it into BLFS -->
     237<!--
    231238    <para>Prevent systemd from resetting the maximum PID value which causes
    232239    some problems with packages and units in BLFS:</para>
    233240   
    234241<screen><userinput remap="adjust">rm -f /usr/lib/sysctl.d/50-pid-max.conf</userinput></screen>
     242-->
    235243
    236244  </sect2>

  • chapter08/util-linux.xml

    rf695e02 r4bda698  
    4242  <sect2 role="installation">
    4343    <title>Installation of Util-linux</title>
    44 
    45     <para>The FHS recommends using the <filename
    46     class="directory">/var/lib/hwclock</filename> directory instead of the
    47     usual <filename class="directory">/etc</filename> directory as the
    48     location for the <filename>adjtime</filename> file. Create this directory
    49     with:</para>
    50 
    51 <screen><userinput remap="pre">mkdir -pv /var/lib/hwclock</userinput></screen>
    5244
    5345    <para>Prepare Util-linux for compilation:</para>

  • chapter08/zlib.xml

    rf695e02 r4bda698  
    6666ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
    6767
     68    <para>Remove an useless static library:</para>
     69
     70<screen><userinput remap="install">rm -fv /usr/lib/libz.a</userinput></screen>
     71
    6872  </sect2>
    6973
    … …  
    131135
    132136      <seglistitem>
    133         <seg>libz.{a,so}</seg>
     137        <seg>libz.so</seg>
    134138      </seglistitem>
    135139    </segmentedlist>
Note: See TracChangeset for help on using the changeset viewer.