Changeset 0dc5ab2e

Timestamp:

11/03/2017 09:43:40 PM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

42e4ab5a

Parents:

e46947f

Message:

Fix some dependencies

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19430 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/genlib/libblockdev.xml (modified) (2 diffs)
• general/genlib/libbytesize.xml (modified) (2 diffs)
• postlfs/security/volume_key.xml (modified) (3 diffs)

general/genlib/libblockdev.xml

@@ -80 +80 @@
     <para role="required">
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="libbytesize"/>,
-      <xref linkend="lvm2"/> (with device-mapper), and
+      <xref linkend="libbytesize"/>, and
       <xref linkend="volume_key"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nss"/> and 
-      <xref linkend="cryptsetup"/> 
     </para>
 
@@ -97 +90 @@
       <xref linkend="mdadm"/>,
       <xref linkend="parted"/>,
-      <xref linkend="python2"/>,
       <ulink url="http://dmraid.sourcearchive.com/">dmraid</ulink>, and 
       <ulink url="http://bcachefs.org/">bcachefs</ulink>

general/genlib/libbytesize.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="pcre2"/>
+      <xref linkend="pcre"/>
     </para>
 
@@ -115 +115 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--with-python3</option>: Use this switch to prefer Python 3 if
+      both Python 2 and Python 3 are installed.
+    </para>
   </sect2>
 

postlfs/security/volume_key.xml

@@ -89 +89 @@
       <xref linkend="glib2"/>,
       <xref linkend="gpgme"/>, and
-      <xref linkend="swig"/>
+      <xref linkend="python2"/>
     </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="python2"/>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="swig"/>
     </para>
 <!--
@@ -115 +115 @@
     </para>
 
-<screen><userinput>sed -i '/config.h/d' lib/libvolume_key.h &amp;&amp;
-
-autoreconf -fiv           &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -129 +126 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+sed -i '/config.h/d' /usr/include/libvolume_key.h</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i '/config.h/d' /usr/include/libvolume_key.h</command>:
+      Removes a reference to config.h, which is not installed.
+    </para>
 
   </sect2>