Changeset cd964c8 for general/genlib

Timestamp:

11/23/2017 03:21:36 AM (6 years ago)

Author:

Ken Moffat <ken@…>

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:

8f31479b

Parents:

6076396

Message:

Build the Python2 libxml2 module and clarify where / when it is used. Make an additional entry for this in the python modules - if trying to build both sets of modules before installing libxml.so, the lib has to be built twice with separate invocations of configure, that is slow if all the optional dependencies are invoked. The dependencies for docbook-xsl are all used at runtime, note that and flag their xref tags as runtime.

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

Location:

general/genlib

Files:

• libxml2.xml (modified) (7 diffs)
• libxslt.xml (modified) (1 diff)

general/genlib/libxml2.xml

@@ -5 +5 @@
   %general-entities;
 
+  <!-- Also updatethe download, md5, size entities in libxml2py2.xml -->
   <!ENTITY libxml2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.gz">
   <!ENTITY libxml2-download-ftp  "ftp://xmlsoft.org/libxml2/libxml2-&libxml2-version;.tar.gz">
@@ -104 +105 @@
         Some packages which utilize <application>libxml2</application> (such as
         <application>GNOME Doc Utils</application>) need the
-        <application>Python</application> module installed to function properly
+        <application>Python3</application> module installed to function properly
         and some packages will not build properly if the
-        <application>Python</application> module is not available.
+        <application>Python3</application> module is not available.
+      </para>
+
+      <para>
+        The old <application>Python2</application> module can be built after
+        <filename class="libraryfile">libxml2.so</filename> has been installed,
+        see <xref linkend="libxml2py2"/>.
       </para>
     </note>
@@ -125 +132 @@
 
    <para>
-      If you want to build the <application>Python</application> module for
-      <xref linkend="python3"/>, run:
+      To ensure that the <application>Python3</application> module can be
+      built by <xref linkend="python3"/>, run:
     </para>
 
@@ -182 +189 @@
 
     <para>
+      <parameter>sed -i '/_PyVerify_fd/,+1d' python/types.c</parameter>: This
+      fixes the <application>Python3</application> code to build with
+      <application>gcc-7</application>.
+    </para>
+
+    <para>
       <parameter>--with-history</parameter>: This switch enables
       <application>Readline</application> support when running
@@ -214 +227 @@
       <seglistitem>
         <seg>
-          xml2-config, xmlcatalog and xmllint
+          xml2-config, xmlcatalog, xmllint and the
+          drv_libxml2.py and libxml2.py <application>Python3</application>
+          modules.
         </seg>
         <seg>
           libxml2.so and optionally, the libxml2mod.so
-          <application>Python</application> module
+          <application>Python3</application> module
         </seg>
         <seg>
@@ -274 +289 @@
       </varlistentry>
 
+      <varlistentry id="drv_libxml2.py3">
+        <term><command>drv_libxml2.py</command></term>
+        <listitem>
+          <para>
+            is a SAX <application>Python3</application> driver for libxml2.
+          </para>
+          <indexterm zone="libxml2 drv_libxml2.py3">
+            <primary sortas="b-drv_libxml2.py">drv_libxml2.py</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxml2.py3">
+        <term><command>libxml2.py</command></term>
+        <listitem>
+          <para>
+            is the <application>Python3</application> binding for libxml2.
+          </para>
+          <indexterm zone="libxml2 libxml2.py3">
+            <primary sortas="b-libxml2.py">libxml2.py</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libxml2-lib">
         <term><filename class="libraryfile">libxml2.so</filename></term>
@@ -287 +326 @@
       </varlistentry>
 
+      <varlistentry id="libxml2mod3">
+        <term><filename class="libraryfile">libxml2mod.so</filename></term>
+        <listitem>
+          <para>
+            is the interface for <application>Python3</application>
+            to use <filename class="libraryfile">libxml2.so</filename>.
+          </para>
+          <indexterm zone="libxml2 libxml2mod3">
+            <primary sortas="c-libxml2mod">libxml2mod.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 

general/genlib/libxslt.xml

@@ -97 +97 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libgcrypt"/> and
-      <xref linkend="python2"/> 
-      <note><simpara>The <xref role="nodep" linkend="python2"/> 
-      dependency is only appropriate if the Python module for
-      this package is needed. If it is, the  
-      <xref role="nodep" linkend="libxml2"/> Python module should also
-      be built for Python 2. The libxslt Python module is not needed for
-      any package in BLFS.
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="libxml2py2"/>
+      <note><simpara>The <xref role="nodep" linkend="libxml2py2"/> 
+      dependency is only appropriate if the <application>Python2</application>
+      module for this package is needed. The
+      libxslt <application>Python2</application> module is not needed for
+      any package in BLFS but various packages may install
+      <application>Python2</application> modules which reference it.
       </simpara></note>
     </para>