Initial commit of alternative cross LFS

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11897 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 34 insertions, 199 deletions

diff --git a/chapter06/python.xml b/chapter06/python.xml
index cc440903d..52c070ab3 100644
--- a/chapter06/python.xml
+++ b/chapter06/python.xml
@@ -5,8 +5,8 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-Python" role="wrap">
-  <?dbhtml filename="Python.html"?>
+<sect1 id="ch-system-Python-temp" role="wrap">
+  <?dbhtml filename="Python-temp.html"?>
 
   <sect1info condition="script">
     <productname>Python</productname>
@@ -16,66 +16,54 @@
 
   <title>Python-&python-version;</title>
 
-  <indexterm zone="ch-system-Python">
-    <primary sortas="a-python">python</primary>
+  <indexterm zone="ch-system-Python-temp">
+    <primary sortas="a-Python">Python</primary>
+    <secondary>temporary</secondary>
   </indexterm>
 
   <sect2 role="package">
     <title/>
 
-    <para>The Python 3 package contains the Python development environment. It
-    is useful for object-oriented programming, writing scripts, prototyping
-    large programs or developing entire applications.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../chapter08/python.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
     <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
+    <segtitle>&buildtime;</segtitle>
       <segtitle>&diskspace;</segtitle>
 
       <seglistitem>
-        <seg>&python-ch6-sbu;</seg>
-        <seg>&python-ch6-du;</seg>
+        <seg>&python-ch5-sbu;</seg>
+        <seg>&python-ch5-du;</seg>
       </seglistitem>
     </segmentedlist>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Python 3</title>
+    <title>Installation of Python</title>
+
+    <note>
+      <para>There are two package files whose name starts with
+      <quote>python</quote>. The one to extract from is
+      <filename>Python-&python-version;.tar.xz</filename> (notice the
+      uppercase first letter).</para>
+    </note>
 
     <para>Prepare Python for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr       \
-            --enable-shared     \
-            --with-system-expat \
-            --with-system-ffi   \
-            --with-ensurepip=yes</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --without-ensurepip</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
-
-    <varlistentry>
-      <term><parameter>--with-system-expat</parameter></term>
-      <listitem>
-        <para>This switch enables linking against system version of
-        <application>Expat</application>.</para>
-       </listitem>
-     </varlistentry>
-
-    <varlistentry>
-      <term><parameter>--with-system-ffi</parameter></term>
-      <listitem>
-        <para>This switch enables linking against system version of
-        <application>libffi</application>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>--with-ensurepip=yes</parameter></term>
-      <listitem>
-        <para>This switch enables building <command>pip</command> and
-        <command>setuptools</command> packaging programs.</para>
-      </listitem>
-    </varlistentry>
+      <title>The meaning of the configure option:</title>
+
+      <varlistentry>
+        <term><parameter>--without-ensurepip</parameter></term>
+        <listitem>
+          <para>This switch disables the Python package installer, which is not
+          needed at this stage.</para>
+        </listitem>
+      </varlistentry>
 
     </variablelist>
 
@@ -83,171 +71,18 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue <command>make test</command>.
-    Some tests requiring network connection or additional packages are
-    skipped.  The test named test_normalization fails because network
-    configuration is not completed yet.  For more comprehensive results,
-    the test can be rerun when Python 3 is reinstalled in BLFS.</para>
-
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install
-chmod -v 755 /usr/lib/libpython&python-minor;.so
-chmod -v 755 /usr/lib/libpython3.so
-ln -sfv pip&python-minor; /usr/bin/pip3</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the install commands:</title>
-<!-- ======  Change 8m if Python minor version changes ======= -->
-    <varlistentry>
-      <term><command>chmod -v 755 /usr/lib/libpython3.{8.,}so</command></term>
-      <listitem>
-        <para>Fix permissions for libraries to be consistent with other
-        libraries.</para>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-    <para>If desired, install the preformatted documentation:</para>
-
-<screen><userinput remap="install">install -v -dm755 /usr/share/doc/python-&python-version;/html 
-
-tar --strip-components=1  \
-    --no-same-owner       \
-    --no-same-permissions \
-    -C /usr/share/doc/python-&python-version;/html \
-    -xvf ../python-&python-version;-docs-html.tar.bz2</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the documentation install commands:</title>
-
-    <varlistentry>
-      <term><option>--no-same-owner</option> and <option>--no-same-permissions</option></term>
-      <listitem>
-        <para>Ensure the installed files have the correct ownership and 
-        permissions.  Without these options, using <application>tar</application>
-        will install the package files with the upstream creator's values. 
-        </para>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="install">make install</userinput></screen>
 
   </sect2>
 
-  <sect2 id="contents-python" role="content">
-    <title>Contents of Python 3</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          2to3, idle3, pip3, pydoc3, python3, and python3-config
-        </seg>
-        <seg>
-          libpython&python-minor;.so and libpython3.so
-        </seg>
-        <seg>
-          /usr/include/python&python-minor;, 
-          /usr/lib/python3, and
-          /usr/share/doc/python-&python-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="python-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="ch-system-Python">
-            <primary sortas="b-2to3">2to3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="idle3">
-        <term><command>idle3</command></term>
-        <listitem>
-          <para>
-            is a wrapper script that opens a <application>Python</application>
-            aware GUI editor. For this script to run, you must have installed
-            <application>Tk</application> before Python so that the Tkinter
-            Python module is built.
-          </para>
-          <indexterm zone="ch-system-Python">
-            <primary sortas="b-idle3">idle3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pip3">
-        <term><command>pip3</command></term>
-        <listitem>
-          <para>
-            The package installer for Python. You can use pip to install
-            packages from Python Package Index and other indexes.
-          </para>
-          <indexterm zone="ch-system-Python">
-            <primary sortas="b-pip3">pip3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pydoc3">
-        <term><command>pydoc3</command></term>
-        <listitem>
-          <para>
-            is the <application>Python</application> documentation tool.
-          </para>
-          <indexterm zone="ch-system-Python">
-            <primary sortas="b-pydoc3">pydoc3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+  <sect2 role="content">
+    <title/>
 
-      <varlistentry id="python3">
-        <term><command>python3</command></term>
-        <listitem>
-          <para>
-            is an interpreted, interactive, object-oriented programming
-            language.
-          </para>
-          <indexterm zone="ch-system-Python">
-            <primary sortas="b-python3">python3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="pyvenv">
-        <term><command>pyvenv</command></term>
-        <listitem>
-          <para>
-            creates virtual <application>Python</application> environments in
-            one or more target directories.
-          </para>
-          <indexterm zone="ch-system-Python">
-            <primary sortas="b-pyvenv">pyvenv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-    </variablelist>
+    <para>Details on this package are located in
+    <xref linkend="contents-python" role="."/></para>
 
   </sect2>
 
 </sect1>
-