Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl 2022-12-10 00:30:12 +01:00
commit f8c7e95786
7 changed files with 49 additions and 47 deletions

View File

@ -23,8 +23,8 @@
<sect2 role="package">
<title/>
<para>The Coreutils package contains utilities for showing and setting the
basic system characteristics.</para>
<para>The Coreutils package contains the basic utility programs
needed by every operating system.</para>
<segmentedlist>
<segtitle>&buildtime;</segtitle>
@ -48,9 +48,9 @@
<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
<note>
<para>In the past, many bugs were found in this patch. When reporting new
bugs to Coreutils maintainers, please check first if they are reproducible
without this patch.</para>
<para>Many bugs have been found in this patch. When reporting new
bugs to the Coreutils maintainers, please check first to see if
those bugs are reproducible without this patch.</para>
</note>
<!-- this has been fixed in upstream gnulib, when a new version of
@ -75,8 +75,8 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
<term><command>autoreconf</command></term>
<listitem>
<para>The patch for internationalization has modified the
building system of the package, so the configuration files have
to be regenerated.</para>
build system, so the configuration files must
be regenerated.</para>
</listitem>
</varlistentry>
@ -84,7 +84,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
<term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
<listitem>
<para>This environment variable allows the package to be
built as the <systemitem class="username">root</systemitem> user.
built by the <systemitem class="username">root</systemitem> user.
</para>
</listitem>
</varlistentry>
@ -93,7 +93,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
<term><parameter>--enable-no-install-program=kill,uptime</parameter></term>
<listitem>
<para>The purpose of this switch is to prevent Coreutils from
installing binaries that will be installed by other packages later.
installing programs that will be installed by other packages.
</para>
</listitem>
</varlistentry>
@ -181,7 +181,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="lbracket">
<term><command>[</command></term>
<listitem>
<para>Is an actual command, /usr/bin/[, that is a synonym
<para>Is an actual command, /usr/bin/[; it is a synonym
for the <command>test</command> command</para>
<indexterm zone="ch-system-coreutils lbracket">
<primary sortas="b-111">[</primary>
@ -275,7 +275,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<term><command>chmod</command></term>
<listitem>
<para>Changes the permissions of each file to the given mode; the mode
can be either a symbolic representation of the changes to make or an
can be either a symbolic representation of the changes to be made, or an
octal number representing the new permissions</para>
<indexterm zone="ch-system-coreutils chmod">
<primary sortas="b-chmod">chmod</primary>
@ -341,7 +341,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<term><command>csplit</command></term>
<listitem>
<para>Splits a given file into several new files, separating them
according to given patterns or line numbers and outputting the byte
according to given patterns or line numbers, and outputting the byte
count of each new file</para>
<indexterm zone="ch-system-coreutils csplit">
<primary sortas="b-csplit">csplit</primary>
@ -363,8 +363,8 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="date">
<term><command>date</command></term>
<listitem>
<para>Displays the current time in the given format, or sets the
system date</para>
<para>Displays the current dae and time in the given format, or sets the
system date and time</para>
<indexterm zone="ch-system-coreutils date">
<primary sortas="b-date">date</primary>
</indexterm>
@ -420,7 +420,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="dirname">
<term><command>dirname</command></term>
<listitem>
<para>Strips the non-directory suffix from a file name</para>
<para>Extracts the directory portion(s) of the given name(s)</para>
<indexterm zone="ch-system-coreutils dirname">
<primary sortas="b-dirname">dirname</primary>
</indexterm>
@ -482,7 +482,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="factor">
<term><command>factor</command></term>
<listitem>
<para>Prints the prime factors of all specified integer numbers</para>
<para>Prints the prime factors of the specified integers</para>
<indexterm zone="ch-system-coreutils factor">
<primary sortas="b-factor">factor</primary>
</indexterm>
@ -587,7 +587,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="link">
<term><command>link</command></term>
<listitem>
<para>Creates a hard link with the given name to a file</para>
<para>Creates a hard link (with the given name) to a file</para>
<indexterm zone="ch-system-coreutils link">
<primary sortas="b-link">link</primary>
</indexterm>
@ -647,8 +647,8 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="mkfifo">
<term><command>mkfifo</command></term>
<listitem>
<para>Creates First-In, First-Outs (FIFOs), a "named
pipe" in UNIX parlance, with the given names</para>
<para>Creates First-In, First-Outs (FIFOs), "named
pipes" in UNIX parlance, with the given names</para>
<indexterm zone="ch-system-coreutils mkfifo">
<primary sortas="b-mkfifo">mkfifo</primary>
</indexterm>
@ -1230,7 +1230,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<term><command>wc</command></term>
<listitem>
<para>Reports the number of lines, words, and bytes for each given
file, as well as a total line when more than one file is given</para>
file, as well as grand totals when more than one file is given</para>
<indexterm zone="ch-system-coreutils wc">
<primary sortas="b-wc">wc</primary>
</indexterm>
@ -1261,7 +1261,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="yes">
<term><command>yes</command></term>
<listitem>
<para>Repeatedly outputs <quote>y</quote> or a given string until
<para>Repeatedly outputs <quote>y</quote>, or a given string, until
killed</para>
<indexterm zone="ch-system-coreutils yes">
<primary sortas="b-yes">yes</primary>

View File

@ -182,7 +182,7 @@ rm -rf DESTDIR</userinput></screen>
<varlistentry id="libltdl">
<term><filename class="libraryfile">libltdl</filename></term>
<listitem>
<para>Hides the various difficulties of opening dynamically linked libraries</para>
<para>Hides the various difficulties of opening dynamically loaded libraries</para>
<indexterm zone="ch-system-libtool libltdl">
<primary sortas="c-libltdl">libltdl</primary>
</indexterm>

View File

@ -23,7 +23,7 @@
<sect2 role="package">
<title/>
<para>Meson is an open source build system meant to be both extremely fast
<para>Meson is an open source build system designed to be both extremely fast
and as user friendly as possible.</para>
<segmentedlist>
@ -36,9 +36,10 @@
</segmentedlist>
<tip revision="sysv">
<para>This section is not strictly required for LFS if not using
systemd. On the other hand, meson/ninja is a powerful build system,
which is expected to be used more and more often. It is required for
<para>This section is not strictly required when LFS does not use
systemd. On the other hand, Meson, along with Ninja, makes
a powerful build system combination,
which will probably be used more and more often. It is required for
several packages in <ulink url="&blfs-book;">the BLFS
book</ulink>.</para>
</tip>
@ -56,7 +57,7 @@
<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
<para>The test suite requires some packages out of the scope of LFS.</para>
<para>The test suite requires some packages outside the scope of LFS.</para>
<para>Install the package:</para>
@ -70,7 +71,7 @@ install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/
<varlistentry>
<term><parameter>-w dist</parameter></term>
<listitem>
<para>Put the created wheels into the
<para>Puts the created wheels into the
<filename class='directory'>dist</filename> directory.</para>
</listitem>
</varlistentry>
@ -78,7 +79,7 @@ install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/
<varlistentry>
<term><parameter>--find-links dist</parameter></term>
<listitem>
<para>Install wheels from the
<para>Installs wheels from the
<filename class='directory'>dist</filename> directory.</para>
</listitem>
</varlistentry>

View File

@ -36,10 +36,10 @@
</segmentedlist>
<tip revision="sysv">
<para>This section is not strictly required for LFS if not using
systemd. On the other hand, ninja associated to meson makes
<para>This section is not strictly required when LFS does not use
systemd. On the other hand, Ninja, along with Meson, makes
a powerful build system combination,
which is expected to be used more and more often. It is required for
which will probably be used more and more often. It is required for
several packages in <ulink url="&blfs-book;">the BLFS
book</ulink>.</para>
</tip>
@ -49,12 +49,12 @@
<sect2 role="installation">
<title>Installation of Ninja</title>
<para>When run, ninja normally runs a maximum number of processes
in parallel. By default this is the number of cores on the system
plus two. In some cases this can overheat a CPU or run a system out
of memory. If run from the command line, passing a -jN parameter
will limit the number of parallel processes, but some packages
embed the execution of ninja and do not pass a -j parameter.</para>
<para>When run, <command>ninja</command> normally utilizes the greatest
possible number of processes in parallel. By default this is the number of cores on the system,
plus two. This may overheat the CPU, or make the system run out
of memory. When <command>ninja</command> is invoked from the command line, passing the -jN parameter
will limit the number of parallel processes. Some packages
embed the execution of <command>ninja</command>, and do not pass the -j parameter on to it.</para>
<para>Using the <emphasis>optional</emphasis> procedure below allows a user to
limit the number of parallel processes via an environment variable,
@ -62,10 +62,10 @@
<screen>export NINJAJOBS=4</screen>
will limit ninja to four parallel processes.</para>
will limit <command>ninja</command> to four parallel processes.</para>
<para>If desired, add the capability to use the environment variable
NINJAJOBS by running:</para>
<para>If desired, make <command>ninja</command> recognize the environment variable
NINJAJOBS by running the stream editor:</para>
<screen><userinput remap="pre">sed -i '/int Guess/a \
int j = 0;\
@ -84,7 +84,7 @@
<varlistentry>
<term><parameter>--bootstrap</parameter></term>
<listitem>
<para>This parameter forces ninja to rebuild itself for the current
<para>This parameter forces Ninja to rebuild itself for the current
system.</para>
</listitem>
</varlistentry>

View File

@ -123,9 +123,10 @@ export BUILD_BZIP2=0</userinput></screen>
<listitem>
<para>These settings define where Perl looks for installed
modules. The LFS editors chose to put them in a directory structure
based on the Major.Minor version of Perl (&perl-version-min;) which
allows upgrading Perl to newer Patch levels (&perl-version;) without
reinstalling all of the modules.</para>
based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
allows upgrading Perl to newer patch levels (the patch level is
the last dot separated part in the full version string like
&perl-version;) without reinstalling all of the modules.</para>
</listitem>
</varlistentry>

View File

@ -66,7 +66,7 @@
<term><parameter>--with-system-ffi</parameter></term>
<listitem>
<para>This switch enables linking against the system version of
<application>libffi.so</application>.</para>
<filename class='libraryfile'>libffi.so</filename>.</para>
</listitem>
</varlistentry>

View File

@ -128,7 +128,7 @@
<term><command>wheel</command></term>
<listitem>
<para>
is a utility to unpack, pack, or convert wheel packages
is a utility to unpack, pack, or convert wheel archives
</para>
<indexterm zone="ch-system-wheel">
<primary sortas="b-wheel">wheel</primary>