Changeset d7e0db5 for chapter07

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

ee1eb70

Parents:

4ea78e0

git-author:

Thomas Trepl <thomas@…> (08/23/2020 08:15:14 AM)

git-committer:

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

Message:

Merge changes from trunk to multilib

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

Location:

chapter07

Files:

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

chapter07/libstdc++-pass2.xml

@@ -63 +63 @@
     <para>Prepare libstdc++ for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">
-../libstdc++-v3/configure            \
+<screen arch="default"><userinput remap="configure">../libstdc++-v3/configure            \
     CXXFLAGS="-g -O2 -D_GNU_SOURCE"  \
     --prefix=/usr                    \

chapter07/perl.xml

@@ -49 +49 @@
              -Dprefix=/usr                               \
              -Dvendorprefix=/usr                         \
-             -Dprivlib=/usr/lib/perl5/5.32/core_perl     \
-             -Darchlib=/usr/lib/perl5/5.32/core_perl     \
-             -Dsitelib=/usr/lib/perl5/5.32/site_perl     \
-             -Dsitearch=/usr/lib/perl5/5.32/site_perl    \
-             -Dvendorlib=/usr/lib/perl5/5.32/vendor_perl \
-             -Dvendorarch=/usr/lib/perl5/5.32/vendor_perl</userinput></screen>
+             -Dprivlib=/usr/lib/perl5/&perl-version-min;/core_perl     \
+             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl     \
+             -Dsitelib=/usr/lib/perl5/&perl-version-min;/site_perl     \
+             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl    \
+             -Dvendorlib=/usr/lib/perl5/&perl-version-min;/vendor_perl \
+             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
 
     <variablelist>

chapter07/stripping.xml

@@ -16 +16 @@
   While still in chroot, remove those files now:</para>
 
-<screen><userinput>find /usr/{lib,libexec} -name \*.la -delete</userinput></screen>
+<screen arch="default"><userinput>find /usr/{lib,libexec} -name \*.la -delete</userinput></screen>
+<screen arch="ml_32"><userinput>find /usr/{lib{,32},libexec} -name \*.la -delete</userinput></screen>
+<screen arch="ml_x32"><userinput>find /usr/{lib{,x32},libexec} -name \*.la -delete</userinput></screen>
+<screen arch="ml_all"><userinput>find /usr/{lib{,{,x}32},libexec} -name \*.la -delete</userinput></screen>
+
+    <para>Remove the documentation of the temporary tools, to prevent them
+    from ending up in the final system, and save about 35 MB:</para>
+
+<screen><userinput>rm -rf /usr/share/{info,man,doc}/*</userinput></screen>
 
   <note><para>
@@ -83 +91 @@
 
     <para>Strip off debugging symbols from binaries:</para>
-<screen role="nodump"><userinput>strip --strip-debug $LFS/usr/lib/*
+<screen arch="default" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib/*
+strip --strip-unneeded $LFS/usr/{,s}bin/*
+strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
+<screen arch="ml_32" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib{,32}/*
+strip --strip-unneeded $LFS/usr/{,s}bin/*
+strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
+<screen arch="ml_x32" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib{,x32}/*
+strip --strip-unneeded $LFS/usr/{,s}bin/*
+strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
+<screen arch="ml_all" role="nodump"><userinput>strip --strip-debug $LFS/usr/lib{,{,x}32}/*
 strip --strip-unneeded $LFS/usr/{,s}bin/*
 strip --strip-unneeded $LFS/tools/bin/*</userinput></screen>
@@ -97 +114 @@
     ones would be destroyed and the toolchain packages would need to be
     built all over again.</para>
-
-    <para>To save more space (slightly more than 35 MB), remove the documentation:</para>
-
-<screen role="nodump"><userinput>rm -rf $LFS/usr/share/{info,man,doc}</userinput></screen>
 
     <para>At this point, you should have at least 5 GB of free space on the