Ignore:
Timestamp:
03/05/2021 04:33:24 PM (9 months ago)
Author:
Pierre Labastie <pieere@…>
Branches:
11.0, ken/refactor-virt, lazarus, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
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:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/libxml2.xml

    r79758477 r0b312a7  
    9191
    9292    <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
    93 
     93<!-- do not advertize python2 here, except in the note below
    9494    <bridgehead renderas="sect4">Optional</bridgehead>
    9595    <para role="optional">
    96       <xref linkend="python2"/> <!--or <xref linkend="python3"/> (to build and
    97       install a <application>Python</application> library module, additionally
    98       it is required to run the full suite of tests)-->
    99       <!-- As discovered by Bruce, itstool needs this module. -->
     96      <xref linkend="python2"/>
     97    </para>
     98-->
     99    <bridgehead renderas="sect4">Optional</bridgehead>
     100    <para role="optional">
     101      <xref linkend="icu"/> (see below) and
     102      <xref linkend="valgrind"/> (may be used in the tests)
    100103    </para>
    101104
    102105    <note>
     106<!-- python3 is always available now
    103107      <para>
    104108        Some packages which utilize <application>libxml2</application> (such as
     
    108112        <application>Python3</application> module is not available.
    109113      </para>
    110 
     114-->
    111115      <para>
    112116        The old <application>Python2</application> module can be built after
     
    116120    </note>
    117121
    118     <bridgehead renderas="sect4">Optional</bridgehead>
    119     <para role="optional">
    120       <xref linkend="icu"/> (see below) and
    121       <xref linkend="valgrind"/> (may be used in the tests)
    122     </para>
    123 
    124122    <para condition="html" role="usernotes">
    125123      User Notes: <ulink url="&blfs-wiki;/libxml2"/>
     
    137135
    138136    <para>
    139       First fix a problem generating the Python3 module with Python-3.9.0 and later:
     137      Fix a problem generating the Python3 module with Python-3.9.0 and
     138      later:
    140139    </para>
    141140
    142141<screen><userinput>sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}</userinput></screen>
    143 
    144 <!--<para>
    145       To ensure that the <application>Python</application> module can be
    146       built by <xref linkend="python3"/>, run:
    147     </para>
    148 
    149 <screen><userinput>sed -i '/_PyVerify_fd/,+1d' python/types.c</userinput></screen>-->
    150142
    151143    <para>
     
    202194
    203195    </note>
     196
    204197    <para>
    205198      Now, as the <systemitem class="username">root</systemitem> user:
     
    214207    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    215208      href="../../xincludes/static-libraries.xml"/>
    216 <!--
    217     <para>
    218       <parameter>sed -i '/_PyVerify_fd/,+1d' python/types.c</parameter>: This
    219       fixes the <application>Python3</application> code to build with
    220       <application>gcc-7</application>.
    221     </para>
    222 -->
     209
    223210    <para>
    224211      <parameter>--with-history</parameter>: This switch enables
Note: See TracChangeset for help on using the changeset viewer.