Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

chapter01/whatsnew.xml

@@ -294,7 +294,7 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
     <listitem>
-      <para>Packaging-24.2</para>
+      <para>Packaging-&packaging-version;</para>
     </listitem>
 
   </itemizedlist>

chapter06/diffutils.xml

@@ -43,18 +43,40 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>First, fix a problem in the current version of diffutils:</para>
-
-    <screen><userinput remap="pre">sed -e '46252,+3 s/^/#/' \
-    -e '46596,+3 s/^/#/' \
-    -i configure</userinput></screen>
-
     <para>Prepare Diffutils for compilation:</para>
 
     <screen><userinput remap="configure">./configure --prefix=/usr   \
             --host=$LFS_TGT \
+            gl_cv_func_strcasecmp_works=y \
             --build=$(./build-aux/config.guess)</userinput></screen>
 
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <!-- https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d9083a4cc638cf9c7dfc3cc534a7c6b4debf50ab -->
+        <term><parameter>gl_cv_func_strcasecmp_works=y</parameter></term>
+        <listitem>
+          <para>This option specify the result of a check for the
+          <function>strcasecmp</function>.  The check requires running a
+          compiled C program, and this is impossible during
+          cross-compilation because in general a cross-compiled program
+          cannot run on the host distro.  Normally for such a check the
+          <command>configure</command> script would use a fall-back value
+          for cross-compilation, but the fall-back value for this check is
+          absent and the <command>configure</command> script would have no
+          value to use and error out.  The upstream has already fixed the
+          issue, but to apply the fix we'd need to run
+          <command>autoconf</command> that the host distro may lack.  So
+          we just specify the check result (<literal>y</literal> as we know
+          the <function>strcasecmp</function> function in
+          Glibc-&glibc-version; works fine) instead, then
+          <command>configure</command> will just use the specified value and
+          skip the check.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>

chapter08/gperf.xml

@@ -48,11 +48,9 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>The tests are known to fail if running multiple
+    <para>To test the results, issue:</para>
-    simultaneous tests (-j option greater than 1). To test
-    the results, issue:</para>
 
-<screen><userinput remap="test">make -j1 check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 

chapter08/packaging.xml

@@ -43,7 +43,7 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of packaging</title>
+    <title>Installation of Packaging</title>
 
     <para>Compile packaging with the following command:</para>
 

general.ent

@@ -44,7 +44,7 @@
 ]]>
 <![ %systemd; [
 <!ENTITY version         "%relnum;-systemd">
-<!ENTITY short-version   "stable-systemd"> <!-- Used below in &blfs-book; -->
+<!ENTITY short-version   "%relnum;-systemd"> <!-- Used below in &blfs-book; -->
 ]]>
 <!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
 <!ENTITY generic-version "%relnum;"> <!-- Used below in