From 6099a4714944f72636abb2cc5b31aead091bd9c5 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 19 Aug 2022 12:41:48 +0800
Subject: [PATCH] Remove libtool archive (.la) files in Chapter 5 and 6

They are really harmful.  In Binutils pass 2, libstdc++.la caused the
building system to use host /usr/lib/libstdc++.so for gprofng.  We now
has disabled gprofng for pass 2, but the similar issue also exists in
GCC pass 2.  In a normal LFS build, the building system silently uses
/usr/lib/libstdc++.so (I guess it does not blow up simply because some
blind luck); in a real cross build (x86 -> ARM for example) the build
will fail.

Remove the .la files to fix this issue.  Instead of only modifying
clfs-ng, it makes more sense to apply the change for trunk: though
the build does not fail, using host library is still a contamination.
---
 chapter01/changelog.xml      | 10 ++++++++++
 chapter05/libstdc++.xml      |  5 +++++
 chapter06/binutils-pass2.xml |  5 +++++
 chapter06/file.xml           |  5 +++++
 chapter06/xz.xml             |  5 +++++
 5 files changed, 30 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8cf25f5b4..780ebbfe5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2022-08-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Remove libtool archive (.la) files in Chapter 5
+          and 6 because those files are harmful for cross compilation.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-08-11</para>
       <itemizedlist>
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 66f17fcd8..c02c9aff8 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -121,6 +121,11 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
+    <para>Remove the libtool archive files because they are harmful for
+    cross compilation:</para>
+
+<screen><userinput remap="install">rm -v $LFS/usr/lib/lib{stdc++,stdc++fs,supc++}.la</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">
diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml
index 1cabf96d9..8766b71e9 100644
--- a/chapter06/binutils-pass2.xml
+++ b/chapter06/binutils-pass2.xml
@@ -98,6 +98,11 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
+    <para>Remove the libtool archive files because they are harmful for
+    cross compilation, and remove unnecessary static libraries:</para>
+
+<screen><userinput remap="install">rm -v $LFS/usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.{a,la}</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 880817509..19d5ae369 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -90,6 +90,11 @@ popd</userinput></screen>
 
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
+    <para>Remove the libtool archive file because it is harmful for cross
+    compilation:</para>
+
+<screen><userinput remap="install">rm -v $LFS/usr/lib/libmagic.la</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index e277f9517..78fa7d4f3 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -59,6 +59,11 @@
 
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
+    <para>Remove the libtool archive file because it is harmful for cross
+    compilation:</para>
+
+<screen><userinput remap="install">rm -v $LFS/usr/lib/liblzma.la</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">