mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-06-19 11:49:20 +01:00
Automatic merge of trunk into multilib
This commit is contained in:
commit
58247ddf0f
@ -43,11 +43,6 @@
|
|||||||
<sect2 role="installation">
|
<sect2 role="installation">
|
||||||
<title>Installation of Texinfo</title>
|
<title>Installation of Texinfo</title>
|
||||||
|
|
||||||
<para>First, fix an issue building the package with Glibc-2.34 or later:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
|
|
||||||
-i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
|
|
||||||
|
|
||||||
<para>Prepare Texinfo for compilation:</para>
|
<para>Prepare Texinfo for compilation:</para>
|
||||||
|
|
||||||
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
|
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
|
||||||
|
@ -127,7 +127,8 @@
|
|||||||
meson-0.62.0), insert the option <parameter>--upgrade</parameter> into
|
meson-0.62.0), insert the option <parameter>--upgrade</parameter> into
|
||||||
the command line. If it's really necessary to downgrade a module or
|
the command line. If it's really necessary to downgrade a module or
|
||||||
reinstall the same version for some reason, insert
|
reinstall the same version for some reason, insert
|
||||||
<parameter>--force-reinstall</parameter> into the command line.
|
<parameter>--force-reinstall --no-deps</parameter> into the command
|
||||||
|
line.
|
||||||
</para>
|
</para>
|
||||||
</important>
|
</important>
|
||||||
|
|
||||||
|
@ -62,11 +62,6 @@
|
|||||||
</variablelist>
|
</variablelist>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<para>Again, fix an issue building the package with Glibc-2.34 or later:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
|
|
||||||
-i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
|
|
||||||
|
|
||||||
<para>Compile the package:</para>
|
<para>Compile the package:</para>
|
||||||
|
|
||||||
<screen><userinput remap="make">make</userinput></screen>
|
<screen><userinput remap="make">make</userinput></screen>
|
||||||
|
Loading…
Reference in New Issue
Block a user