Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl 2023-11-27 00:30:18 +01:00
commit 0959b7b711
2 changed files with 4 additions and 6 deletions

View File

@ -6,6 +6,7 @@
<!-- Convenient entity for "Systemd" or "Udev" --> <!-- Convenient entity for "Systemd" or "Udev" -->
<!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase> <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
<phrase revision='sysv'>Udev</phrase>"> <phrase revision='sysv'>Udev</phrase>">
<!ENTITY bdb "<ulink url='https://www.oracle.com/database/technologies/related/berkeleydb.html'>Berkeley DB</ulink>">
]> ]>
<appendix id="appendixc" xreflabel="Appendix C"> <appendix id="appendixc" xreflabel="Appendix C">
@ -1486,7 +1487,7 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg> <seg>
<ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>, &bdb;,
<ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>, <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
<ulink url="&github;/libbpf/libbpf">libbpf</ulink>, <ulink url="&github;/libbpf/libbpf">libbpf</ulink>,
<ulink url="&blfs-book;basicnet/libmnl.html">libmnl</ulink>, and <ulink url="&blfs-book;basicnet/libmnl.html">libmnl</ulink>, and
@ -2486,7 +2487,7 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg> <seg>
<ulink url="&blfs-book;server/db.html">Berkeley DB</ulink> &bdb;
</seg> </seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -2655,7 +2656,7 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg> <seg>
<ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>, &bdb;,
<ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>, <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
<ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
<ulink url="&blfs-book;general/tk.html">Tk</ulink> <ulink url="&blfs-book;general/tk.html">Tk</ulink>

View File

@ -45,9 +45,6 @@
be built since it depends on Berkeley DB, which is not installed in be built since it depends on Berkeley DB, which is not installed in
LFS. However, a directory and a man page for <command>arpd</command> will still LFS. However, a directory and a man page for <command>arpd</command> will still
be installed. Prevent this by running the commands shown below. be installed. Prevent this by running the commands shown below.
(If the <command>arpd</command> program is needed,
instructions for compiling Berkeley DB can be found in the BLFS book at
<ulink url="&blfs-book;server/db.html"/>.)
</para> </para>
<screen><userinput remap="pre">sed -i /ARPD/d Makefile <screen><userinput remap="pre">sed -i /ARPD/d Makefile