Changeset 0b312a7 for general/genlib/libxml2.xml

Timestamp:

03/05/2021 04:33:24 PM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:

136321c7

Parents:

79758477

Message:

Remove reference to python2 in libxml2 (except in a note), and do some cleaning

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

File:

• general/genlib/libxml2.xml (modified) (6 diffs)

general/genlib/libxml2.xml

@@ -91 +91 @@
 
     <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
-
+<!-- do not advertize python2 here, except in the note below
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="python2"/> <!--or <xref linkend="python3"/> (to build and
-      install a <application>Python</application> library module, additionally
-      it is required to run the full suite of tests)-->
-      <!-- As discovered by Bruce, itstool needs this module. -->
+      <xref linkend="python2"/>
+    </para>
+-->
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="icu"/> (see below) and
+      <xref linkend="valgrind"/> (may be used in the tests)
     </para>
 
     <note>
+<!-- python3 is always available now
       <para>
         Some packages which utilize <application>libxml2</application> (such as
@@ -108 +112 @@
         <application>Python3</application> module is not available.
       </para>
-
+-->
       <para>
         The old <application>Python2</application> module can be built after
@@ -116 +120 @@
     </note>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> (see below) and
-      <xref linkend="valgrind"/> (may be used in the tests)
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libxml2"/>
@@ -137 +135 @@
 
     <para>
-      First fix a problem generating the Python3 module with Python-3.9.0 and later:
+      Fix a problem generating the Python3 module with Python-3.9.0 and
+      later:
     </para>
 
 <screen><userinput>sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}</userinput></screen>
-
-<!--<para>
-      To ensure that the <application>Python</application> module can be
-      built by <xref linkend="python3"/>, run:
-    </para>
-
-<screen><userinput>sed -i '/_PyVerify_fd/,+1d' python/types.c</userinput></screen>-->
 
     <para>
@@ -202 +194 @@
 
     </note>
+
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -214 +207 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-<!--
-    <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