From b1b91826710349da5c3da7a97e4ce77834f77a7d Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 5 Sep 2023 18:04:21 +0800
Subject: chapter08: Move pkgconf before binutils

It allows binutils to link to zstd, so binutils will have
zstd-compressed debug section support (the compression is not enabled
by default but can be enabled via LDFLAGS etc. if wanted).

We also need to add libzstd.so.&zstd-version; into online_usrlib to
prevent a crash in stripping.
---
 appendices/dependencies.xml |  8 +++++---
 chapter01/changelog.xml     | 11 +++++++++++
 chapter08/chapter08.xml     |  2 +-
 chapter08/stripping.xml     |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 6f03da578..0ab386dff 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -286,7 +286,8 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC,
-          Glibc, Grep, Make, Perl, Sed, Texinfo, and Zlib</seg>
+          Glibc, Grep, Make, Perl, Pkgconf, Sed, Texinfo, Zlib, and
+          Zstd</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2518,7 +2519,8 @@
       <segmentedlist id="pkgconf-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg><phrase revision='systemd'>D-Bus, </phrase>E2fsprogs,
+          <seg>Binutils,
+          <phrase revision='systemd'>D-Bus, </phrase>E2fsprogs,
           IProute2, Kmod, Man-DB, Procps-ng, Python,
           &systemd-udev;, and Util-linux</seg>
         </seglistitem>
@@ -3396,7 +3398,7 @@
       <segmentedlist id="zstd-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>GCC, Libelf, and &systemd-udev;</seg>
+          <seg>Binutils, GCC, Libelf, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 46215237f..29b9dfb19 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,17 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2023-09-05</para>
+      <itemizedlist>
+        <listitem>
+           <para>[xry111] - Move pkgconf before binutils for binutils
+           building system to detect zstd properly.
+           <ulink url='&lfs-ticket-root;5340'>#5340</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-09-04</para>
       <itemizedlist>
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 3f356d39e..8ab81d2f8 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
@@ -39,7 +40,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcrypt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml
index 9e71f4382..68e0f8da1 100644
--- a/chapter08/stripping.xml
+++ b/chapter08/stripping.xml
@@ -94,6 +94,7 @@ online_usrlib="libbfd-&binutils-version;.so
                libm.so.6
                libreadline.so.&readline-soversion;
                libz.so.&zlib-version;
+               libzstd.so.&zstd-version;
                $(cd /usr/lib; find libnss*.so* -type f)"
 
 for BIN in $online_usrbin; do
-- 
cgit v1.2.3-54-g00ecf