Changeset 181662f


Ignore:
Timestamp:
03/04/2012 08:29:13 PM (12 years ago)
Author:
Andrew Benton <andy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
7753fc6
Parents:
a6bd736
Message:

Python tweaks. Hopefully fixes Ticket #3269

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

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • general/prog/python2.xml

    ra6bd736 r181662f  
    55  %general-entities;
    66
    7   <!ENTITY python2-download-http "http://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz">
     7  <!ENTITY python2-download-http
     8  "http://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz">
    89  <!ENTITY python2-download-ftp  " ">
    910  <!-- <!ENTITY python2-download-ftp  "&gentoo-ftp-repo;/Python-&python2-version;.tar.xz"> -->
    … …  
    1213  <!ENTITY python2-buildsize     "235 MB (not including the test suite)">
    1314  <!ENTITY python2-time          "1 SBU (not including the test suite)">
    14   <!ENTITY python2htmldoc-download-http "http://docs.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2">
     15  <!ENTITY python2htmldoc-download-http
     16  "http://docs.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2">
    1517  <!ENTITY python2htmldoc-md5sum        "40f0bd51b221662cae14fb0c6b6f622b">
    1618  <!ENTITY python2htmldoc-size          "4.1 MB">
    … …  
    3436    <title>Introduction to Python 2</title>
    3537
    36     <para>The <application>Python 2</application> package contains the
    37     <application>Python</application> development environment.
    38     This is useful for object-oriented programming, writing scripts,
    39     prototyping large programs or developing entire applications.  This version
    40     is for backward compatibility with other dependent packages.</para>
    41 
    42     <!-- Python compiled against Pth, OpenSSL, and SQLite.
    43          326 tests OK, 36 tests skipped, 0 failures -->
     38    <para>
     39      The <application>Python 2</application> package contains the
     40      <application>Python</application> development environment. This is useful
     41      for object-oriented programming, writing scripts, prototyping large
     42      programs or developing entire applications. This version is for backward
     43      compatibility with other dependent packages.
     44    </para>
    4445
    4546    &lfs70_checked;
    … …  
    4849    <itemizedlist spacing="compact">
    4950      <listitem>
    50         <para>Download (HTTP): <ulink url="&python2-download-http;"/></para>
    51       </listitem>
    52       <listitem>
    53         <para>Download (FTP): <ulink url="&python2-download-ftp;"/></para>
    54       </listitem>
    55       <listitem>
    56         <para>Download MD5 sum: &python2-md5sum;</para>
    57       </listitem>
    58       <listitem>
    59         <para>Download size: &python2-size;</para>
    60       </listitem>
    61       <listitem>
    62         <para>Estimated disk space required: &python2-buildsize;</para>
    63       </listitem>
    64       <listitem>
    65         <para>Estimated build time: &python2-time;</para>
     51        <para>
     52          Download (HTTP): <ulink url="&python2-download-http;"/>
     53        </para>
     54      </listitem>
     55      <listitem>
     56        <para>
     57          Download (FTP): <ulink url="&python2-download-ftp;"/>
     58        </para>
     59      </listitem>
     60      <listitem>
     61        <para>
     62          Download MD5 sum: &python2-md5sum;
     63        </para>
     64      </listitem>
     65      <listitem>
     66        <para>
     67          Download size: &python2-size;
     68        </para>
     69      </listitem>
     70      <listitem>
     71        <para>
     72          Estimated disk space required: &python2-buildsize;
     73        </para>
     74      </listitem>
     75      <listitem>
     76        <para>
     77          Estimated build time: &python2-time;
     78        </para>
    6679      </listitem>
    6780    </itemizedlist>
    … …  
    7285      <title>Optional HTML Documentation</title>
    7386      <listitem>
    74         <para>Download (HTTP): <ulink url="&python2htmldoc-download-http;"/></para>
    75       </listitem>
    76       <listitem>
    77         <para>Download MD5 sum: &python2htmldoc-md5sum;</para>
    78       </listitem>
    79       <listitem>
    80         <para>Download size: &python2htmldoc-size;</para>
     87        <para>
     88          Download (HTTP): <ulink url="&python2htmldoc-download-http;"/>
     89        </para>
     90      </listitem>
     91      <listitem>
     92        <para>
     93          Download MD5 sum: &python2htmldoc-md5sum;
     94        </para>
     95      </listitem>
     96      <listitem>
     97        <para>
     98          Download size: &python2htmldoc-size;
     99        </para>
    81100      </listitem>
    82101    </itemizedlist>
    … …  
    85104
    86105    <bridgehead renderas="sect4">Optional</bridgehead>
    87     <para role="optional"><xref linkend="pth"/>,
    88     <xref linkend="libffi"/> or <xref linkend="gcc"/> (install JAVA so that the
    89     <filename class="libraryfile">libffi</filename> library is built), and
    90     <ulink url="http://www.bluez.org/">BlueZ</ulink></para>
    91 
    92     <bridgehead renderas="sect4">Optional
    93     (to create package-specific support modules)</bridgehead>
    94     <para role="optional"><xref linkend="openssl"/>,
    95     <xref linkend="tk"/>,
    96     <xref linkend="db"/>, and
    97     <xref linkend="sqlite"/></para>
    98 
    99     <para>Note that there is a circular dependency with the
    100     <application>Tk</application> package as it requires Xorg to be installed
    101     but parts of Xorg depend on <application>Python</application>.</para>
    102 
    103     <para condition="html" role="usernotes">User Notes:
    104     <ulink url="&blfs-wiki;/Python"/></para>
    105 
     106    <para role="optional">
     107      <!-- <xref linkend="pth"/> can only be used if you've overwritten glibc's
     108      libpthread. -->
     109      <xref linkend="libffi"/> and <xref linkend="pkgconfig"/>
     110      (<command>configure</command> uses <command>pkgconfig</command> to find
     111      <application>libffi</application>. There is a circular dependency here:
     112      <application>Pkgconfig</application> requires
     113      <application>Glib</application> which requires
     114      <application>Python 2</application>),
     115      <!-- gcc's libffi does not install a pkgconfig file -->
     116      <ulink url="http://sphinx.pocoo.org/">Sphinx</ulink> (to create the docs),
     117      <ulink url="http://www.bluez.org/">BlueZ</ulink>,
     118      <xref linkend="openssl"/>,
     119      <xref linkend="tk"/> (there is a circular dependency with the
     120      <application>Tk</application> package as it requires Xorg to be installed
     121      but parts of Xorg depend on <application>Python</application>),
     122      <xref linkend="db"/> and
     123      <xref linkend="sqlite"/>.
     124    </para>
     125
     126    <para condition="html" role="usernotes">
     127      User Notes: <ulink url="&blfs-wiki;/Python"/>
     128    </para>
    106129  </sect2>
    107130
    … …  
    109132    <title>Installation of Python</title>
    110133
    111     <para>Install <application>Python</application> by running the following
    112     commands:</para>
    113 
    114 <screen><userinput>sed -i "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" setup.py &amp;&amp;
    115 ./configure --prefix=/usr --enable-shared &amp;&amp;
     134    <para>
     135      Install <application>Python</application> by running the following
     136      commands:
     137    </para>
     138
     139<screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;
    116140make</userinput></screen>
    117141
    118     <para>To test the results, issue: <command>make test</command>. Note that
    119     if you have an existing <application>Python 2</application> installation
    120     which includes the <application>PyXML</application> module, the tests could
    121     produce a segmentation fault.</para>
    122 
    123     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     142    <para>
     143      To test the results, issue: <command>make test</command>.
     144    </para>
     145
     146    <para>
     147      In order to use the <command>help ('name_string')</command> feature of the
     148      <command>python</command> interpreter with some statements and keywords,
     149      you must create or download the optional HTML documentation.
     150    </para>
     151
     152    <para>
     153      If you have installed <ulink url="http://sphinx.pocoo.org/">Sphinx</ulink>
     154      and wish to create the HTML documentation:
     155    </para>
     156
     157<screen><userinput>make -C Doc html</userinput></screen>
     158
     159    <para>
     160      Now, as the <systemitem class="username">root</systemitem> user:
     161    </para>
    124162
    125163<screen role="root"><userinput>make install &amp;&amp;
    126164chmod -v 755 /usr/lib/libpython&python2-majorver;.so.1.0</userinput></screen>
    127165
    128     <para>There is no documentation installed using the instructions above.
    129     See the <filename>Doc/README.txt</filename> file in the source
    130     distribution for instructions on how to create the html. Alternatively,
    131     you can download preformatted documentation from <ulink
    132     url="http://docs.python.org/download.html"/>.</para>
    133 
    134     <para>In order to use the <command>help ('name_string')</command> feature
    135     of the <command>python</command> interpreter with some statements and
    136     keywords, you must download (or create) the optional HTML documentation
    137     and install it. If you downloaded the HTML docs, issue the following
    138     commands as the
    139     <systemitem class="username">root</systemitem> user:</para>
    140 
    141 <screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&python2-version;/html &amp;&amp;
    142 tar --strip-components=1 \
    143     --no-same-owner \
    144     --no-same-permissions \
    145     -C /usr/share/doc/Python-&python2-version;/html \
     166    <para>
     167      If you created the html documentation with
     168      <application>Sphinx</application> then install it as the
     169      <systemitem class="username">root</systemitem> user:
     170    </para>
     171
     172<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&python2-version; &amp;&amp;
     173cp -rfv Doc/build/html/* /usr/share/doc/python-&python2-version;</userinput></screen>
     174
     175    <para>
     176      Alternatively, you can download preformatted documentation from
     177      <ulink url="http://docs.python.org/download.html"/> and install it as the
     178      <systemitem class="username">root</systemitem> user:
     179    </para>
     180
     181<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&python2-version; &amp;&amp;
     182tar --strip-components=1 -C /usr/share/doc/Python-&python2-version; \
    146183    -xvf ../python-&python2-version;-docs-html.tar.bz2</userinput></screen>
    147 
    148184  </sect2>
    149185
    … …  
    151187    <title>Command Explanations</title>
    152188
    153     <para><command>sed -i "s/ndbm_libs = ..." setup.py</command>: This command
    154     is used to fix a build problem with the <application>GDBM</application>
    155     library.</para>
    156 
    157     <para><command>chmod ...</command>: Fix permissions for libraries to be
    158     consistent with other libraries.</para>
    159 
     189    <para>
     190      <option>--with-system-ffi</option>: If you have installed
     191      <application>Libffi</application> and
     192      <application>Pkgconfig</application>, add this option to compile
     193      <application>Python</application>'s _ctypes module using the system
     194      installed <application>Libffi</application>. Otherwise
     195      <application>Python</application> will compile its own copy of
     196      <application>Libffi</application>.
     197    </para>
     198
     199    <para>
     200      <command>chmod ...</command>: Fix permissions for libraries to be
     201      consistent with other libraries.
     202    </para>
    160203  </sect2>
    161204
    … …  
    163206    <title>Configuring Python 2</title>
    164207
    165     <para>In order for <command>python</command> to find the installed
    166     documentation, you must add the following environment variable to
    167     individual user's or the system's profile:</para>
    168 
    169     <screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&python2-version;/html</userinput></screen>
    170 
     208    <para>
     209      In order for <command>python</command> to find the installed
     210      documentation, you must add the following environment variable to
     211      individual user's or the system's profile:
     212    </para>
     213
     214<screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&python2-version;</userinput></screen>
    171215  </sect2>
    172216
    … …  
    180224
    181225      <seglistitem>
    182         <seg>pydoc, python, python-config, python&python2-majorver;,
    183         python&python2-majorver;-config, smtpd.py, and optionally if
    184         <application>Tk</application> is installed, idle</seg>
    185         <seg>libpython&python2-majorver;.so and numerous modules installed in
    186         /usr/lib/python&python2-majorver;/lib-dynload</seg>
    187         <seg>/usr/include/python&python2-majorver;,
    188         /usr/lib/python&python2-majorver;, and
    189         /usr/share/doc/python-&python2-version;</seg>
     226        <seg>
     227          pydoc, python, python-config, python&python2-majorver;,
     228          python&python2-majorver;-config, smtpd.py, and optionally if
     229          <application>Tk</application> is installed, idle
     230        </seg>
     231        <seg>
     232          libpython&python2-majorver;.so and numerous modules installed in
     233          /usr/lib/python&python2-majorver;/lib-dynload
     234        </seg>
     235        <seg>
     236          /usr/include/python&python2-majorver;,
     237          /usr/lib/python&python2-majorver;, and
     238          /usr/share/doc/python-&python2-version;</seg>
    190239      </seglistitem>
    191240    </segmentedlist>
    … …  
    199248        <term><command>idle</command></term>
    200249        <listitem>
    201           <para>is a wrapper script that opens a
    202           <application>Python</application> aware GUI editor.</para>
     250          <para>
     251            is a wrapper script that opens a <application>Python</application>
     252            aware GUI editor.
     253          </para>
    203254          <indexterm zone="python2 idle2">
    204255            <primary sortas="b-idle2">idle</primary>
    … …  
    210261        <term><command>pydoc</command></term>
    211262        <listitem>
    212           <para>is the <application>Python</application> documentation
    213           tool.</para>
     263          <para>
     264            is the <application>Python</application> documentation tool.
     265          </para>
    214266          <indexterm zone="python2 pydoc2">
    215267            <primary sortas="b-pydoc2">pydoc</primary>
    … …  
    218270      </varlistentry>
    219271
    220       <varlistentry id="python2-prog">
     272      <varlistentry id="python">
    221273        <term><command>python</command></term>
    222274        <listitem>
    223           <para>is an interpreted, interactive, object-oriented programming
    224           language.</para>
    225           <indexterm zone="python2 python2-prog">
     275          <para>
     276            is an interpreted, interactive, object-oriented programming
     277            language.
     278          </para>
     279          <indexterm zone="python2 python">
    226280            <primary sortas="b-python2">python</primary>
    227281          </indexterm>
    … …  
    232286        <term><command>python&python2-majorver;</command></term>
    233287        <listitem>
    234           <para>is a version-specific name for the <command>python</command>
    235           program.</para>
     288          <para>
     289            is a version-specific name for the <command>python</command>
     290            program.
     291          </para>
    236292          <indexterm zone="python2 python2-ver">
    237293            <primary sortas="b-python&python2-majorver;">python&python2-majorver;</primary>
    … …  
    243299        <term><command>smtpd.py</command></term>
    244300        <listitem>
    245           <para>is an SMTP proxy implemented in
    246           <application>Python</application>.</para>
     301          <para>
     302            is an SMTP proxy implemented in <application>Python</application>.
     303          </para>
    247304          <indexterm zone="python2 smtpd.py2">
    248305            <primary sortas="b-smtpd.py2">smtpd.py</primary>
    … …  
    250307        </listitem>
    251308      </varlistentry>
    252 
    253309    </variablelist>
    254 
    255   </sect2>
    256 
     310  </sect2>
    257311</sect1>

  • networking/netprogs/netprogs.xml

    ra6bd736 r181662f  
    3737  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3.xml"/>
    3838<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3-client.xml"/> -->
    39 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/> -->
    4039  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wget.xml"/>
    4140  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless-tools.xml"/>
Note: See TracChangeset for help on using the changeset viewer.