Changeset 51b58ad for chapter07

Timestamp:

03/31/2021 10:41:39 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

c63253fb

Parents:

ce2f9d8

git-author:

Thomas Trepl <thomas@…> (07/08/2020 07:36:00 PM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:39 AM)

Message:

Merge changes from trunk to multilib

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

Location:

chapter07

Files:

• libstdc++-pass2.xml (modified) (3 diffs)
• python.xml (modified) (1 diff)

chapter07/libstdc++-pass2.xml

@@ -63 +63 @@
     <para>Prepare libstdc++ for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">../libstdc++-v3/configure           \
-    CXXFLAGS="-g -O2 -D_GNU_SOURCE" \
-    --prefix=/usr                   \
-    --disable-multilib              \
-    --disable-nls                   \
+<screen arch="default"><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>
-<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../libstdc++-v3/configure           \
-    CXXFLAGS="-g -O2 -D_GNU_SOURCE" \
-    --prefix=/usr                   \
-    --enable-multilib               \
-    --disable-nls                   \
-    --disable-libstdcxx-pch         \
-    --host=x86_64-lfs-linux-gnu</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../libstdc++-v3/configure            \
+    CXXFLAGS="-g -O2 -D_GNU_SOURCE"  \
+    --prefix=/usr                    \
+    --enable-multilib                \
+    --disable-nls                    \
+    --host=$(uname -m)-lfs-linux-gnu \
+    --disable-libstdcxx-pch</userinput></screen>
 
     <variablelist>
@@ -85 +87 @@
           <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>
@@ -103 +114 @@
           will be built for every arch (m64, m32, mx32) which are
           made available in <xref linkend="ch-tools-gcc-pass1"/>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry arch="ml_32,ml_x32,ml_all">
-        <term><parameter>--host=x86_64-pc-linux-gnu</parameter></term>
-        <listitem>
-          <para>Since up to now the cross-compile tools are used. This
-          switch is set to ensure that the headers used for multilib are
-          placed in correct locations where the final system can pick
-          them up.</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>