diff options
| -rw-r--r-- | chapter01/changelog.xml | 18 | ||||
| -rw-r--r-- | chapter07/libstdc++-pass2.xml | 20 | ||||
| -rw-r--r-- | chapter07/python.xml | 11 | ||||
| -rw-r--r-- | chapter08/revisedchroot.xml | 13 | ||||
| -rw-r--r-- | general.ent | 6 |
5 files changed, 59 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 5a43c9575..1bcc2cada 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,24 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2020-07-04</para> + <itemizedlist> + <listitem> + <para>[pierre] - Remove /tools and files containing + {i686,x86_64}-lfs in their name at the end of chapter 8.</para> + </listitem> + <listitem> + <para>[pierre] - Add --host= to libstdc++-pass2, so that host + specific headers are installed in a host specific directory.</para> + </listitem> + <listitem> + <para>[pierre] - Fix temporary Python so that static libraries + are not installed.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <itemizedlist> <para>2020-07-01</para> <listitem> diff --git a/chapter07/libstdc++-pass2.xml b/chapter07/libstdc++-pass2.xml index 015d8d8ea..35b5a8baf 100644 --- a/chapter07/libstdc++-pass2.xml +++ b/chapter07/libstdc++-pass2.xml @@ -62,11 +62,12 @@ cd build</userinput></screen> <para>Prepare libstdc++ for compilation:</para> -<screen><userinput remap="configure">../libstdc++-v3/configure \ - CXXFLAGS="-g -O2 -D_GNU_SOURCE" \ - --prefix=/usr \ - --disable-multilib \ - --disable-nls \ +<screen><userinput remap="configure">../libstdc++-v3/configure \ + CXXFLAGS="-g -O2 -D_GNU_SOURCE" \ + --prefix=/usr \ + --disable-multilib \ + --disable-nls \ + --host=$(uname -m)-lfs-linux-gnu \ --disable-libstdcxx-pch</userinput></screen> <variablelist> @@ -81,6 +82,15 @@ cd build</userinput></screen> </varlistentry> <varlistentry> + <term><parameter>--host=$(uname -m)-lfs-linux-gnu</parameter></term> + <listitem> + <para>We have to mimic what would happen if this package were built + as part of a full compiler build. This switch would be passed to + configure by GCC's build machinery.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><parameter>--disable-libstdcxx-pch</parameter></term> <listitem> <para>This switch prevents the installation of precompiled diff --git a/chapter07/python.xml b/chapter07/python.xml index a3b9239cf..68a02dd8c 100644 --- a/chapter07/python.xml +++ b/chapter07/python.xml @@ -52,12 +52,21 @@ <para>Prepare Python for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr --without-ensurepip</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr \ + --enable-shared \ + --without-ensurepip</userinput></screen> <variablelist> <title>The meaning of the configure option:</title> <varlistentry> + <term><parameter>--enable-shared</parameter></term> + <listitem> + <para>This switch prevents installation of static libraries.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><parameter>--without-ensurepip</parameter></term> <listitem> <para>This switch disables the Python package installer, which is not diff --git a/chapter08/revisedchroot.xml b/chapter08/revisedchroot.xml index e0321fdc9..b62fc87b8 100644 --- a/chapter08/revisedchroot.xml +++ b/chapter08/revisedchroot.xml @@ -62,6 +62,19 @@ rm -f /usr/lib/libz.a</userinput></screen> url="&blfs-book;/introduction/la-files.html">BLFS section "About Libtool Archive (.la) files"</ulink>.</para> + <para>The compiler built in <xref linkend="chapter-temporary-tools"/> and + <xref linkend="chapter-chroot-temporary-tools"/> is still partially + installed, and not needed anymore. Remove it with:</para> + +<screen><userinput>find /usr/{bin,lib,libexec,include} \ + -depth \ + -name $(uname -m)-lfs-linux-gnu\* | xargs rm -rf</userinput></screen> + + <para>The <filename class="directory">/tools</filename> directory can also + be removed to further gain some place:</para> + +<screen><userinput>rm -rf /tools</userinput></screen> + <para>Finally, remove the temporary 'tester' user account created at the beginning of the previous chapter.</para> diff --git a/general.ent b/general.ent index 3ea3b7945..f119819fa 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20200701"> +<!ENTITY version "SVN-20200704"> <!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 "20200701-systemd"> +<!ENTITY versiond "20200704-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "July 1st, 2020"> +<!ENTITY releasedate "July 4th, 2020"> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not – --> |