aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2019-02-14 19:11:08 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2019-02-14 19:11:08 +0000
commit791b6c7029f0b6fcbae872645ddf7cfb634d125a (patch)
tree0106cb40cf8e6c226f5d824ef4150336d8eede88
parent75828c36ccd065cca1236e0b5fc824e726d211b4 (diff)
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
-rw-r--r--chapter01/changelog.xml12
-rw-r--r--chapter05/python.xml24
-rw-r--r--chapter06/bash.xml2
-rw-r--r--general.ent6
4 files changed, 38 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f55324c9e..85fdfd493 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,6 +46,17 @@
<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>
+ <listitem>
<para>[bdubbs] - Update to linux-4.20.7. Fixes
<ulink url="&lfs-ticket-root;4421">#4421</ulink>.</para>
</listitem>
@@ -56,7 +67,6 @@
</itemizedlist>
</listitem>
-
<listitem>
<para>2019-02-08</para>
<itemizedlist>
diff --git a/chapter05/python.xml b/chapter05/python.xml
index a52c08294..951185b31 100644
--- a/chapter05/python.xml
+++ b/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>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 3c8146d0c..7294ccc3f 100644
--- a/chapter06/bash.xml
+++ b/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>
diff --git a/general.ent b/general.ent
index 65d8db819..0c609c35f 100644
--- a/general.ent
+++ b/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">