Changeset 879d269

Timestamp:

02/17/2009 11:10:06 PM (15 years ago)

Author:

Randy McMurchy <randy@…>

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:

c3f2d96

Parents:

a270244

Message:

Replaced two patches with seds in the Python instructions, also updated the dependencies and installed programs sections

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

Files:

• general.ent (modified) (1 diff)
• general/prog/python.xml (modified) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">

general/prog/python.xml

@@ -8 +8 @@
   <!ENTITY python-download-ftp  "&gentoo-ftp-repo;/Python-&Python-version;.tar.bz2">
   <!ENTITY python-md5sum        "e81c2f0953aa60f8062c05a4673f2be0">
-  <!ENTITY python-size          "10.5 MB">
-  <!ENTITY python-buildsize     "186 MB (additional 13M to run the test suite)">
-  <!ENTITY python-time          "1.2 SBU (additional 2.6 SBU to run the test suite)">
+  <!ENTITY python-size          "10.9 MB">
+  <!ENTITY python-buildsize     "227 MB">
+  <!ENTITY python-time          "1.4 SBU (additional 2.9 SBU to run the test suite)">
 ]>
 
@@ -59 +59 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
 
+    <!-- replaced with seds
     <bridgehead renderas="sect4">Required Patch</bridgehead>
     <itemizedlist spacing='compact'>
@@ -73 +74 @@
         url="&patch-root;/Python-&Python-version;-testing-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect4">Optional HTML Documentation</bridgehead>
@@ -86 +87 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pth"/></para>
+    <para role="optional"><xref linkend="pth"/>,
+    <xref linkend="gcc"/> (install JAVA for the
+    <filename class="libraryfile">libffi</filename> library) or
+    <ulink url="http://sourceware.org/libffi/">libffi</ulink>, and
+    <ulink url="http://www.bluez.org/">BlueZ</ulink></para>
 
     <bridgehead renderas="sect4">Optional
@@ -107 +112 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../Python-&Python-version;-gdbm-1.patch &amp;&amp;
-patch -Np1 -i ../Python-&Python-version;-testing-1.patch &amp;&amp;
+<screen><userinput>sed -i "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" \
+     setup.py &amp;&amp;
+sed -i "s/www.python.invalid./sadflkjsasf.i.nvali.d/" \
+     Lib/test/test_urllib2_localnet.py \
+     Lib/test/test_urllibnet.py &amp;&amp;
+
 ./configure --prefix=/usr --enable-shared &amp;&amp;
 make</userinput></screen>
@@ -141 +150 @@
     -xvf ../python-&python-majorver;-docs-html.tar.bz2</userinput></screen>
 
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i "s/ndbm_libs = ..." setup.py</command>: This command
+    is used to fix a build problem with the <application>GDBM</application>
+    library.</para>
+
+    <para><command>sed -i "s/www.python.invalid./ ..."</command>: This command
+    is copied from upstream and used to fix an intermittent problem with a
+    couple of the test suite programs.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Python</title>
+
     <para>In order for <command>python</command> to find the installed
     documentation, you must add the following environment variable to
@@ -158 +185 @@
 
       <seglistitem>
-        <seg>pydoc, python, python&python-majorver;, smtpd.py, and optionally if
+        <seg>2to3, pydoc, python, python-config, python&python-majorver;,
+        python&python-majorver;-config, smtpd.py, and optionally if
         <application>Tk</application> is installed, idle</seg>
         <seg>libpython&python-majorver;.so and numerous modules installed in

introduction/welcome/changelog.xml

@@ -43 +43 @@
 
     <listitem>
+      <para>February 18th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Replaced two patches with seds in the Python
+          instructions, also updated the dependencies and installed
+          programs sections.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 16th, 2009</para>
       <itemizedlist>