Jelajahi Sumber

Fix a problem when building Python in Chapter 5 where some hosts may use host
dependent headers.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11519 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 6 tahun lalu
induk
melakukan
791b6c7029
4 mengubah file dengan 38 tambahan dan 6 penghapusan
  1. 11 1
      chapter01/changelog.xml
  2. 23 1
      chapter05/python.xml
  3. 1 1
      chapter06/bash.xml
  4. 3 3
      general.ent

+ 11 - 1
chapter01/changelog.xml

@@ -42,6 +42,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2019-02-011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Fix a problem when building Python in
+          Chapter 5 where some hosts may use host dependent 
+          headers.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2019-02-011</para>
       <itemizedlist>
@@ -56,7 +67,6 @@
       </itemizedlist>
     </listitem>
 
-
     <listitem>
       <para>2019-02-08</para>
       <itemizedlist>

+ 23 - 1
chapter05/python.xml

@@ -43,9 +43,31 @@
   <sect2 role="installation">
     <title>Installation of Python</title>
 
+    <para>This package first builds the Python interpreter, then some
+    standard Python modules. The main script for building modules is
+    written in Python, and uses hard-coded paths to the host <filename
+    class="directory">/usr/include</filename> and <filename
+    class="directory">/usr/lib</filename> directories. To prevent them
+    from being used, issue:</para>
+
+<screen><userinput remap="pre">sed -i '/def add_multiarch_paths/a \        return' setup.py</userinput></screen>
+
     <para>Prepare Python for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools --with-ensurepip=no</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools --without-ensurepip</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure option:</title>
+
+      <varlistentry>
+        <term><parameter>--without-ensurepip</parameter></term>
+        <listitem>
+          <para>This switch disables the Python installer, which is not needed
+          at this stage.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para>Compile the package:</para>
 

+ 1 - 1
chapter06/bash.xml

@@ -80,7 +80,7 @@
     <para>Now, run the tests as the <systemitem
     class="username">nobody</systemitem> user:</para>
 
-<screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH make tests"</userinput></screen>
+<screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH HOME=/home make tests"</userinput></screen>
 
     <para>Install the package and move the main executable to
     <filename class='directory'>/bin</filename>:</para>

+ 3 - 3
general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190211">
+<!ENTITY version         "SVN-20190214">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20190211-systemd">
+<!ENTITY versiond        "20190214-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 11, 2019">
+<!ENTITY releasedate     "February 14, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.4">