Changeset cd964c8


Ignore:
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, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, 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

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r6076396 rcd964c8  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "19">                   <!-- Always 2 digits -->
     3<!ENTITY day          "22">                   <!-- Always 2 digits -->
    44<!ENTITY month        "11">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2017">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "November 19th, &year;">
     9<!ENTITY releasedate  "November 22nd, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • general/genlib/libxml2.xml

    r6076396 rcd964c8  
    55  %general-entities;
    66
     7  <!-- Also updatethe download, md5, size entities in libxml2py2.xml -->
    78  <!ENTITY libxml2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.gz">
    89  <!ENTITY libxml2-download-ftp  "ftp://xmlsoft.org/libxml2/libxml2-&libxml2-version;.tar.gz">
    … …  
    104105        Some packages which utilize <application>libxml2</application> (such as
    105106        <application>GNOME Doc Utils</application>) need the
    106         <application>Python</application> module installed to function properly
     107        <application>Python3</application> module installed to function properly
    107108        and some packages will not build properly if the
    108         <application>Python</application> module is not available.
     109        <application>Python3</application> module is not available.
     110      </para>
     111
     112      <para>
     113        The old <application>Python2</application> module can be built after
     114        <filename class="libraryfile">libxml2.so</filename> has been installed,
     115        see <xref linkend="libxml2py2"/>.
    109116      </para>
    110117    </note>
    … …  
    125132
    126133   <para>
    127       If you want to build the <application>Python</application> module for
    128       <xref linkend="python3"/>, run:
     134      To ensure that the <application>Python3</application> module can be
     135      built by <xref linkend="python3"/>, run:
    129136    </para>
    130137
    … …  
    182189
    183190    <para>
     191      <parameter>sed -i '/_PyVerify_fd/,+1d' python/types.c</parameter>: This
     192      fixes the <application>Python3</application> code to build with
     193      <application>gcc-7</application>.
     194    </para>
     195
     196    <para>
    184197      <parameter>--with-history</parameter>: This switch enables
    185198      <application>Readline</application> support when running
    … …  
    214227      <seglistitem>
    215228        <seg>
    216           xml2-config, xmlcatalog and xmllint
     229          xml2-config, xmlcatalog, xmllint and the
     230          drv_libxml2.py and libxml2.py <application>Python3</application>
     231          modules.
    217232        </seg>
    218233        <seg>
    219234          libxml2.so and optionally, the libxml2mod.so
    220           <application>Python</application> module
     235          <application>Python3</application> module
    221236        </seg>
    222237        <seg>
    … …  
    274289      </varlistentry>
    275290
     291      <varlistentry id="drv_libxml2.py3">
     292        <term><command>drv_libxml2.py</command></term>
     293        <listitem>
     294          <para>
     295            is a SAX <application>Python3</application> driver for libxml2.
     296          </para>
     297          <indexterm zone="libxml2 drv_libxml2.py3">
     298            <primary sortas="b-drv_libxml2.py">drv_libxml2.py</primary>
     299          </indexterm>
     300        </listitem>
     301      </varlistentry>
     302
     303      <varlistentry id="libxml2.py3">
     304        <term><command>libxml2.py</command></term>
     305        <listitem>
     306          <para>
     307            is the <application>Python3</application> binding for libxml2.
     308          </para>
     309          <indexterm zone="libxml2 libxml2.py3">
     310            <primary sortas="b-libxml2.py">libxml2.py</primary>
     311          </indexterm>
     312        </listitem>
     313      </varlistentry>
     314
    276315      <varlistentry id="libxml2-lib">
    277316        <term><filename class="libraryfile">libxml2.so</filename></term>
    … …  
    287326      </varlistentry>
    288327
     328      <varlistentry id="libxml2mod3">
     329        <term><filename class="libraryfile">libxml2mod.so</filename></term>
     330        <listitem>
     331          <para>
     332            is the interface for <application>Python3</application>
     333            to use <filename class="libraryfile">libxml2.so</filename>.
     334          </para>
     335          <indexterm zone="libxml2 libxml2mod3">
     336            <primary sortas="c-libxml2mod">libxml2mod.so</primary>
     337          </indexterm>
     338        </listitem>
     339      </varlistentry>
     340
    289341    </variablelist>
    290342

  • general/genlib/libxslt.xml

    r6076396 rcd964c8  
    9797    <bridgehead renderas="sect4">Optional</bridgehead>
    9898    <para role="optional">
    99       <xref linkend="libgcrypt"/> and
    100       <xref linkend="python2"/>
    101       <note><simpara>The <xref role="nodep" linkend="python2"/>
    102       dependency is only appropriate if the Python module for
    103       this package is needed. If it is, the 
    104       <xref role="nodep" linkend="libxml2"/> Python module should also
    105       be built for Python 2. The libxslt Python module is not needed for
    106       any package in BLFS.
     99      <xref linkend="libgcrypt"/>,
     100      <xref linkend="libxml2py2"/>
     101      <note><simpara>The <xref role="nodep" linkend="libxml2py2"/>
     102      dependency is only appropriate if the <application>Python2</application>
     103      module for this package is needed. The
     104      libxslt <application>Python2</application> module is not needed for
     105      any package in BLFS but various packages may install
     106      <application>Python2</application> modules which reference it.
    107107      </simpara></note>
    108108    </para>

  • general/prog/python-modules.xml

    r6076396 rcd964c8  
    9696      <listitem>
    9797        <para>
     98          <xref linkend="libxml2py2"/>
     99        </para>
     100      </listitem>
     101      <listitem>
     102        <para>
    98103          <xref linkend="lxml"/>
    99104        </para>
    … …  
    174179
    175180  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     181    href="libxml2py2.xml"/>
     182
     183  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    176184    href="lxml.xml"/>
    177185

  • general/prog/scons.xml

    r6076396 rcd964c8  
    8181    <para role="optional">
    8282      <xref linkend="docbook-xsl"/>,
    83       <xref linkend="libxml2"/>, and
    84       <xref linkend="libxslt"/>
     83      <xref role="runtime" linkend="libxml2py2"/> and
     84      <xref role="runtime" linkend="libxslt"/> (the
     85       <application>Python2</application> modules can be invoked at
     86       runtime if using the SCons Docbook tool)
    8587    </para>
    8688

  • introduction/welcome/changelog.xml

    r6076396 rcd964c8  
    4343-->
    4444    <listitem>
     45      <para>November 22nd, 2017</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[ken] -  Add instructions to build the Python2 module for
     49          libxml2, and clarify where / when it is used. Fixes
     50          <ulink url="&blfs-ticket-root;10048">#10048</ulink>.</para>
     51        </listitem>
     52      </itemizedlist>
     53    </listitem>
     54
     55    <listitem>
    4556      <para>November 19th, 2017</para>
    4657      <itemizedlist>

  • packages.ent

    r6076396 rcd964c8  
    164164<!ENTITY libusb-compat-version        "0.1.5">
    165165<!ENTITY libxkbcommon-version         "0.7.2">
     166<!-- the libxml2-version is also used for the python2 module,
     167which is built separately after libxml2.so has been installed,
     168to avoid building libxml2 twice, which is slow with all deps -->
    166169<!ENTITY libxml2-version              "2.9.7">
    167170<!ENTITY libxslt-version              "1.1.32">
    … …  
    403406<!ENTITY funcsigs-version             "1.0.2">
    404407<!ENTITY Jinja2-version               "2.10">
     408<!-- libxml2 for Python2 shares the version of libxml2 -->
    405409<!ENTITY lxml-version                 "4.1.1">
    406410<!ENTITY mako-version                 "1.0.4">

  • pst/xml/docbook-xsl.xml

    r6076396 rcd964c8  
    8080    <bridgehead renderas="sect3">DocBook XSL Stylesheets Dependencies</bridgehead>
    8181
    82     <bridgehead renderas="sect4">Recommended</bridgehead>
    83     <para role="recommended"><xref linkend="libxml2"/></para>
    84 
    85     <bridgehead renderas="sect4">Optional</bridgehead>
     82    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
     83    <para role="recommended"><xref role="runtime" linkend="libxml2"/></para>
     84
     85    <bridgehead renderas="sect4">Optional (all used at runtime)</bridgehead>
    8686    <para role="optional">
    87       <xref linkend="apache-ant"/> (to produce <quote>webhelp</quote> documents),
    88       <xref linkend="libxslt"/> (or any other XSLT processor, to process
    89       Docbook documents),
    90       <xref linkend="python2"/>,
    91       <xref linkend="ruby"/> (to utilize the <quote>epub</quote> stylesheets),
    92       <xref linkend="zip"/> (to produce <quote>epub3</quote> documents), and
     87      <xref role="runtime" linkend="apache-ant"/> (to produce <quote>webhelp</quote> documents),
     88      <xref role="runtime"  linkend="libxslt"/> (or any other XSLT processor), to process
     89      Docbook documents - the <application>Python2</application> modules
     90      libxml2 and libxslt can be used,
     91      <xref role="runtime" linkend="python2"/> (at runtime),
     92      <xref role="runtime" linkend="ruby"/> (to utilize the <quote>epub</quote> stylesheets),
     93      <xref role="runtime" linkend="zip"/> (to produce <quote>epub3</quote> documents), and
    9394      <ulink url="http://sourceforge.net/projects/saxon/files/saxon6/">
    9495        Saxon6
    9596      </ulink> and
    9697      <ulink url="http://xerces.apache.org/xerces2-j/">Xerces2 Java</ulink>
    97       (used with <xref linkend="apache-ant"/> to produce <quote>webhelp</quote>
     98      (used with <xref role="runtime" linkend="apache-ant"/> to produce <quote>webhelp</quote>
    9899      documents)
    99100    </para>

  • xsoft/other/gimp.xml

    r6076396 rcd964c8  
    116116    <bridgehead renderas="sect4">Required</bridgehead>
    117117    <para role="required">
    118       <xref linkend="gegl"/> and
    119       <xref linkend="gtk2"/>
     118      <xref linkend="gegl"/>,
     119      <xref linkend="gtk2"/> and
     120      <xref linkend="libxml2py2"/> (to build the help files)
    120121    </para>
    121122
Note: See TracChangeset for help on using the changeset viewer.