Fix python2's install procedures to omit

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

general/prog/python2.xml

@@ -127,19 +127,26 @@
 
   <sect2 role="installation">
     <title>Installation of Python 2</title>
-
+<!--
     <caution>
       <para>
         After installing this package or 
         updating <application>pip2</application> with the command
-        <command>pip2 install --upgrade pip</command>, it will remove
+        <command>pip2 install - -upgrade pip</command>, it will remove
         <application>pip3</application> installed in LFS. To reset 
         <application>pip</application> and <application>pip3</application>,
         run, as the <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="nodump"><userinput>python3 -m pip install --force pip</userinput></screen>
+<screen role="nodump"><userinput>python3 -m pip install - -force pip</userinput></screen>
     </caution>
+-->
+    <para>
+      First, disable the installation of a script that overwrites a more 
+      recent script:
+    </para>
+
+<screen><userinput>sed -i '/2to3/d' ./setup.py</userinput></screen>
 
     <para>
       Install <application>Python 2</application> by running the following
@@ -150,7 +157,6 @@
             --enable-shared     \
             --with-system-expat \
             --with-system-ffi   \
-            --with-ensurepip=yes \
             --enable-unicode=ucs4 &amp;&amp;
 make</userinput></screen>
 
@@ -162,7 +168,9 @@ make</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
+<screen role="root"><userinput>make altinstall                                &amp;&amp;
+ln -s python2.7        /usr/bin/python2        &amp;&amp;
+ln -s python2.7-config /usr/bin/python2-config &amp;&amp;
 chmod -v 755 /usr/lib/libpython&python2-majorver;.so.1.0</userinput></screen>
 
     <para>
@@ -206,6 +214,7 @@ find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</use
       <parameter>--with-ensurepip=yes</parameter> : This switch enables building
       <command>pip</command> and <command>setuptools</command> packaging programs.
       <command>setuptools</command> is needed for building some Python modules.
+      This switch is not recommended because this version of Python is being phased out.
     </para>
 
     <para>
@@ -220,6 +229,11 @@ find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</use
       <application>GDBM</application>.
     </para>
 
+    <para>
+      <command>make altinstall</command>: This make target omits some default 
+      symbolic links that may interfere with Python 3.
+    </para>
+
     <para>
       <command>chmod ...</command>: Fix permissions for libraries to be
       consistent with other libraries.
@@ -250,10 +264,13 @@ find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</use
 
       <seglistitem>
         <seg>
-          2to3, pip2, pydoc, python (symlink), python-config (symlink),
+          pydoc, 
-          python2 (symlink), python2-config (symlink),
+          python2 (symlink), 
-          python&python2-majorver;, python&python2-majorver;-config,
+          python2-config (symlink),
-          smtpd.py, and idle
+          python&python2-majorver;, 
+          python&python2-majorver;-config,
+          smtpd.py, and 
+          idle
         </seg>
         <seg>
           libpython&python2-majorver;.so
@@ -270,35 +287,6 @@ find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</use
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="python2-2to3">
-        <term><command>2to3</command></term>
-        <listitem>
-          <para>
-            is a <application>Python</application> program that reads
-            <application>Python 2.x</application> source code and applies a
-            series of fixes to transform it into valid
-            <application>Python 3.x</application> code.
-          </para>
-          <indexterm zone="python2 python2-2to3">
-            <primary sortas="b-2to3">2to3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pip2">
-        <term><command>pip2</command></term>
-        <listitem>
-          <para>
-            is the package manager for <application>Python 2.x</application>. 
-            It is used to automate management of
-            <application>Python 2.x</application> modules.
-          </para>
-          <indexterm zone="python2 pip2">
-            <primary sortas="b-pip2">pip2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="idle">
         <term><command>idle</command></term>
         <listitem>
@@ -327,7 +315,7 @@ find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</use
       </varlistentry>
 
       <varlistentry id="python">
-        <term><command>python</command></term>
+        <term><command>python2</command></term>
         <listitem>
           <para>
             is an interpreted, interactive, object-oriented programming

introduction/welcome/changelog.xml

@@ -44,6 +44,10 @@
     <listitem>
       <para>November 4th, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix python2's install procedures to omit
+          unneeded files.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to mariadb-10.5.7 (Security Update). Fixes
           <ulink url="&blfs-ticket-root;14210">#14210</ulink>.</para>