Changeset 25771c3

Timestamp:

07/04/2020 09:14:57 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

b6c0d12

Parents:

5a986cbf

Message:

Various clean up:

• prevent static python libraries to be installed in chapter 7 since it is not overwrittent in chapter 8
• have libstdc++-pass2 install its host specific headers into a host specific directory
• clean the temporary compiler and the cros compiler at the end of chapter 8

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter07/libstdc++-pass2.xml (modified) (2 diffs)
• chapter07/python.xml (modified) (1 diff)
• chapter08/revisedchroot.xml (modified) (1 diff)
• general.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -44 +44 @@
     -->
     <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>

chapter07/libstdc++-pass2.xml

@@ -63 +63 @@
     <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>
 
@@ -78 +79 @@
           <para>These flags are passed by the top level Makefile when doing
           a full build of GCC.</para>
+        </listitem>
+      </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>

chapter07/python.xml

@@ -53 +53 @@
     <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>

chapter08/revisedchroot.xml

@@ -63 +63 @@
    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>

general.ent

@@ -1 @@
-<!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 &ndash; -->