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.
This commit is contained in:
Xi Ruoyao 2023-09-05 18:04:21 +08:00
parent 1ec60f1daf
commit b1b9182671
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
4 changed files with 18 additions and 4 deletions

View File

@ -286,7 +286,8 @@
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC, <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> </seglistitem>
</segmentedlist> </segmentedlist>
@ -2518,7 +2519,8 @@
<segmentedlist id="pkgconf-before"> <segmentedlist id="pkgconf-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <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, IProute2, Kmod, Man-DB, Procps-ng, Python,
&systemd-udev;, and Util-linux</seg> &systemd-udev;, and Util-linux</seg>
</seglistitem> </seglistitem>
@ -3396,7 +3398,7 @@
<segmentedlist id="zstd-before"> <segmentedlist id="zstd-before">
<segtitle>&before;</segtitle> <segtitle>&before;</segtitle>
<seglistitem> <seglistitem>
<seg>GCC, Libelf, and &systemd-udev;</seg> <seg>Binutils, GCC, Libelf, and &systemd-udev;</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

View File

@ -40,6 +40,17 @@
appropriate for the entry or if needed the entire day's listitem. 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> <listitem>
<para>2023-09-04</para> <para>2023-09-04</para>
<itemizedlist> <itemizedlist>

View File

@ -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="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="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="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="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="gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.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="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="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="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="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="sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>

View File

@ -94,6 +94,7 @@ online_usrlib="libbfd-&binutils-version;.so
libm.so.6 libm.so.6
libreadline.so.&readline-soversion; libreadline.so.&readline-soversion;
libz.so.&zlib-version; libz.so.&zlib-version;
libzstd.so.&zstd-version;
$(cd /usr/lib; find libnss*.so* -type f)" $(cd /usr/lib; find libnss*.so* -type f)"
for BIN in $online_usrbin; do for BIN in $online_usrbin; do