Automatic merge of trunk into multilib

chapter06/binutils-pass2.xml

@@ -43,11 +43,17 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
 
-    <!-- Don't remove this until Binutils upstream updates the libtool
+    <!-- Don't remove this until Binutils upstream resolves this issue.
-         copy.  On some host distros the issue doesn't show up.  -->
+         We can test by building Binutils on a complete system with
-    <para>Binutils ships an outdated copy of libtool in the tarball.  It lacks
+         zlib (libz.so) installed, passing enable-shared and
-    sysroot support, so the produced binaries will be mistakenly linked to
+         without-system-zlib.  If the resulted libctf.so still links against
-    libraries from the host distro.  Work around this issue:</para>
+         libz.so (check with readelf -d) despite we are saying
+         without-system-zlib, then the issue is still unresolved.  -->
+    <para>Binutils relies on an internal libtool copy to link against
+    internal static libraries, but the libiberty and zlib copies shipped
+    in the package do not use libtool.  This inconsistency may cause
+    produced binaries mistakenly linked against libraries from the host
+    distro.  Work around this issue:</para>
 
 <screen><userinput remap="pre">sed '6009s/$add_dir//' -i ltmain.sh</userinput></screen>
 

chapter06/coreutils.xml

@@ -43,17 +43,13 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-<!--
-<screen><userinput remap="configure">export gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
--->
     <para>Prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                     \
             --host=$LFS_TGT                   \
             --build=$(build-aux/config.guess) \
             --enable-install-program=hostname \
-            --enable-no-install-program=kill,uptime \
+            --enable-no-install-program=kill,uptime</userinput></screen>
-            gl_cv_macro_MB_CUR_MAX_good=y</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter07/perl.xml

@@ -57,7 +57,8 @@
              -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the new Configure options:</title>
+      <title>The meaning of the Configure options:</title>
+
       <varlistentry>
         <term><parameter>-des</parameter></term>
         <listitem>
@@ -67,6 +68,35 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Dvendorprefix=/usr</parameter></term>
+        <listitem>
+          <para>This ensures <command>perl</command> knows how to
+          tell packages where they should install their Perl modules.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Duseshrplib</parameter></term>
+        <listitem>
+          <para>Build <systemitem class='library'>libperl</systemitem>
+          needed by some Perl modules as a shared library, instead of
+          a static library.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dprivlib,-Darchlib,-Dsitelib,...</parameter></term>
+        <listitem>
+          <para>These settings define where Perl looks for installed
+          modules. The LFS editors chose to put them in a directory structure
+          based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
+          allows upgrading Perl to newer patch levels (the patch level is
+          the last dot separated part in the full version string like
+          &perl-version;) without reinstalling all of the modules.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>

chapter08/gmp.xml

@@ -260,7 +260,7 @@ rm -rf DESTDIR</userinput></screen>
     <title>Contents of GMP</title>
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed libraries</segtitle>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>

chapter08/libelf.xml

@@ -136,8 +136,8 @@ rm -rf DESTDIR</userinput></screen>
     <title>Contents of Libelf</title>
 
     <segmentedlist>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>

chapter08/mpc.xml

@@ -69,8 +69,8 @@ make install-html</userinput></screen>
     <title>Contents of MPC</title>
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>libmpc.so</seg>

chapter08/mpfr.xml

@@ -58,7 +58,7 @@ make html</userinput></screen>
       Do not skip it under any circumstances.</para>
     </important>
 
-    <para>Test the results and ensure that all 197 tests passed:</para>
+    <para>Test the results and ensure that all 198 tests passed:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
@@ -74,7 +74,7 @@ make install-html</userinput></screen>
     <title>Contents of MPFR</title>
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed libraries</segtitle>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>

chapter08/perl.xml

@@ -76,15 +76,7 @@ export BUILD_BZIP2=0</userinput></screen>
              -Dusethreads</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the new Configure options:</title>
-
-      <varlistentry>
-        <term><parameter>-Dvendorprefix=/usr</parameter></term>
-        <listitem>
-          <para>This ensures <command>perl</command> knows how to
-          tell packages where they should install their Perl modules.</para>
-        </listitem>
-      </varlistentry>
 
       <varlistentry>
         <term><parameter>-Dpager="/usr/bin/less -isR"</parameter></term>
@@ -104,13 +96,6 @@ export BUILD_BZIP2=0</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>-Duseshrplib</parameter></term>
-        <listitem>
-          <para>Build a shared libperl needed by some Perl modules.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>-Dusethreads</parameter></term>
         <listitem>
@@ -118,18 +103,6 @@ export BUILD_BZIP2=0</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>-Dprivlib,-Darchlib,-Dsitelib,...</parameter></term>
-        <listitem>
-          <para>These settings define where Perl looks for installed
-          modules. The LFS editors chose to put them in a directory structure
-          based on the MAJOR.MINOR version of Perl (&perl-version-min;) which
-          allows upgrading Perl to newer patch levels (the patch level is
-          the last dot separated part in the full version string like
-          &perl-version;) without reinstalling all of the modules.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
     <para>Compile the package:</para>

chapter08/python.xml

@@ -191,9 +191,9 @@ tar --strip-components=1  \
     <title>Contents of Python 3</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed library</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>

chapter08/util-linux.xml

@@ -42,7 +42,7 @@
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-    <para>First, disable a problem test:</para>
+    <para>First, disable a problematic test:</para>
 
     <screen><userinput remap="pre">sed -i '/test_mkfds/s/^/#/' tests/helpers/Makemodule.am</userinput></screen>