Changeset c4d96918

Timestamp:

01/24/2019 06:30:47 PM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, bdubbs/svn, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

25997c4a

Parents:

52f590c6

Message:

Fix deps of asciidoc, and remove the need for P2 in volume_key

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

Files:

• general/genutils/asciidoc.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/security/volume_key.xml (modified) (3 diffs)

general/genutils/asciidoc.xml

@@ -61 +61 @@
     <bridgehead renderas="sect3">Asciidoc Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/> 
+    <bridgehead renderas="sect4">Required (Run time)</bridgehead>
+    <para role="required">
+      <xref role="runtime" linkend="python2"/> 
     </para>
 

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>January 24th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update volume_key dependencies and instructions,
+          to avoid using Python 2.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update Asciidoc dependencies; Python 2 is required
+          at runtime.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to NSS-3.41.1. Fixes

postlfs/security/volume_key.xml

@@ -78 +78 @@
       <xref linkend="cryptsetup"/>,
       <xref linkend="glib2"/>,
-      <xref linkend="gpgme"/>, 
-      <xref linkend="nss"/>, 
-      <xref linkend="python2"/>, and
+      <xref linkend="gpgme"/>, and
+      <xref linkend="nss"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="swig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="python2"/>
     </para>
 
@@ -103 +111 @@
     </note>
 
-<screen><userinput>autoreconf -fiv           &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>autoreconf -fiv              &amp;&amp;
+./configure --prefix=/usr    \
+            --without-python &amp;&amp;
 make</userinput></screen>
 
@@ -119 +128 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--without-python</parameter>: This parameter prevents building
+      the <application>Python 2</application> bindings, if <xref
+      linkend="python2"/> is installed.
+    </para>
+
+    <para>
+      <option>--without-python3</option>: Use this option if you do not want
+      to build the <application>Python 3</application> bindings. In this case,
+      <xref linkend="swig"/> is not needed.
+    </para>
+
+  </sect2>
   <sect2 role="content">
     <title>Contents</title>