diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 204ef4c78..1d4a0abac 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -432,7 +432,9 @@ &external; - None + + libsubunit + @@ -489,7 +491,7 @@ &dependencies; Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, - Make, Sed, Systemd, and Util-linux + Make, Pkgconf, Sed, Systemd, and Util-linux @@ -606,7 +608,9 @@ &dependencies; Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, - Gzip, Make, Sed, Texinfo, and Util-linux + Gzip, Make, Pkgconf, Sed, + Systemd, Texinfo, and + Util-linux @@ -996,7 +1000,8 @@ &external; - GNAT + GDC, + GNAT, and ISL @@ -1485,7 +1490,7 @@ &dependencies; Bash, Bison, Coreutils, Flex, GCC, Glibc, Make, Libcap, Libelf, - Linux API Headers, and Zlib + Linux API Headers, Pkgconf, and Zlib @@ -1516,7 +1521,7 @@ Berkeley DB, iptables, - libbpf, + libbpf, libmnl, and libtirpc @@ -1607,7 +1612,7 @@ &dependencies; Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc, - Gzip, Make, OpenSSL, Pkg-config, Sed, Xz, and Zlib + Gzip, Make, OpenSSL, Pkgconf, Sed, Xz, and Zlib @@ -1822,7 +1827,7 @@ &testsuites; - Check + Check and Pkgconf @@ -2051,7 +2056,8 @@ &dependencies; Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext, - Glibc, Grep, Groff, Gzip, Less, Libpipeline, Make, Sed, and Xz + Glibc, Grep, Groff, Gzip, Less, Libpipeline, Make, Pkgconf, Sed, + Systemd, and Xz @@ -2484,9 +2490,9 @@ - Pkg-config + Pkgconf - + &dependencies; Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, @@ -2494,33 +2500,33 @@ - + &runtime; Glibc - + &testsuites; None - + &before; - Kmod + D-Bus, E2fsprogs, + IProute2, Kmod, Man-DB, Procps-ng, Python, + Systemd, and Util-linux - + &external; - - Glib2 - + None @@ -2530,7 +2536,9 @@ &dependencies; - Bash, Binutils, Coreutils, GCC, Glibc, Make, and Ncurses + Bash, Binutils, Coreutils, GCC, Glibc, Make, Ncurses, + and Pkgconf, and Systemd @@ -2558,7 +2566,12 @@ &external; - None + + None + + elogind + + @@ -2608,7 +2621,8 @@ &dependencies; Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc, - Grep, Libffi, Make, Ncurses, OpenSSL, Sed, and Util-linux + Grep, Libffi, Make, Ncurses, OpenSSL, Pkgconf, Sed, and + Util-linux @@ -2812,8 +2826,8 @@ &dependencies; Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, - GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Meson, Sed, Util-linux, - and Zstd + GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Meson, Pkgconf, Sed, + Util-linux, and Zstd @@ -2834,7 +2848,7 @@ &before; - None + D-Bus, E2fsprogs, Man-DB, Procps-ng, and Util-linux @@ -3056,8 +3070,8 @@ &dependencies; Bash, Binutils, Coreutils, Diffutils, - Eudev, Findutils, Gawk, - GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, + Eudev, File, Findutils, Gawk, + GCC, Gettext, Glibc, Grep, Make, Ncurses, Pkgconf, Sed, Systemd, and Zlib @@ -3089,10 +3103,14 @@ Libcap-NG, + libeconf, + libuser, + libutempter, Linux-PAM - and smartmontools + url="&blfs-book;postlfs/linux-pam.html">Linux-PAM, + smartmontools, and + slang diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8d3e1de56..e2b70f617 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,25 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + + 2023-06-17 + + + [xry111] - Update to linux-6.3.8. Fixes + #5272. + + + [xry111] - Update to kbd-2.6.0. Fixes + #5273. + + + [rahul] - Changed from pkg-config to pkgconf 1.9.5. Fixes + #5274. + + + + 2023-06-09 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 4107693bf..ded7e7df0 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -229,9 +229,6 @@ Perl-&perl-version; - Procps-ng-&procps-ng-version; @@ -307,6 +304,10 @@ Added: + + Pkgconf-&flit-core-version; + + Flit-core-&flit-core-version; @@ -328,6 +329,10 @@ Removed: + + Pkg-config-0.29.2 + + systemd-252-security_fix-1.patch diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 87238724d..569d6b6aa 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -609,11 +609,11 @@ - Pkg-config (&pkgconfig-version;) - &pkgconfig-size;: + Pkgconf (&pkgconf-version;) - &pkgconf-size;: - Home page: - Download: - MD5 sum: &pkgconfig-md5; + Home page: + Download: + MD5 sum: &pkgconf-md5; diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index 91827b88e..605d26782 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -29,7 +29,6 @@ - @@ -39,7 +38,7 @@ - + diff --git a/chapter08/flex.xml b/chapter08/flex.xml index d05474f03..478637adc 100644 --- a/chapter08/flex.xml +++ b/chapter08/flex.xml @@ -73,9 +73,11 @@ try to run its predecessor, lex. To support those programs, create a symbolic link named lex that runs flex in lex emulation - mode: + mode, and also create the man page of lex as a + symlink: -ln -sv flex /usr/bin/lex +ln -sv flex /usr/bin/lex +ln -sv flex.1 /usr/share/man/man1/lex.1 diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml index 3e177948e..a6b74460b 100644 --- a/chapter08/gawk.xml +++ b/chapter08/gawk.xml @@ -61,6 +61,12 @@ su tester -c "PATH=$PATH make check" make LN='ln -f' install + The installation process already created awk + as a symlink to gawk, create its man page as a + symlink as well: + +ln -sv gawk.1 /usr/share/man/man1/awk.1 + The meaning of the overridden make variable: diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml index fa94c54ea..d50774f26 100644 --- a/chapter08/gcc.xml +++ b/chapter08/gcc.xml @@ -208,12 +208,14 @@ su tester -c "PATH=$PATH make -k check" for "historical" reasons. ln -svr /usr/bin/cpp /usr/lib - + Many packages use the name cc to call the C + compiler. We've already created cc as a symlink in + , create its man page as a symlink + as well: + +ln -sv gcc.1 /usr/share/man/man1/cc.1 + Add a compatibility symlink to enable building programs with Link Time Optimization (LTO): diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 641144135..b4025f6ff 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -195,9 +195,9 @@ esac touch /etc/ld.so.conf - Fix the Makefile to skip an unneeded sanity check - that fails in the LFS partial environment: - + + Fix the Makefile to skip an outdated sanity check + that fails with a modern Glibc configuration: sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml new file mode 100644 index 000000000..724a1ff24 --- /dev/null +++ b/chapter08/pkgconf.xml @@ -0,0 +1,123 @@ + + + %general-entities; +]> + + + + + + pkgconf + &pkgconf-version; +
&pkgconf-url;
+
+ + Pkgconf-&pkgconf-version; + + + Pkgconf + + + + + + <para>The pkgconf package is a + successor to pkg-config and contains a tool for passing the include path + and/or library paths to build tools during the configure and make phases + of package installations.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&pkgconf-fin-sbu;</seg> + <seg>&pkgconf-fin-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Pkgconf + + Prepare Pkgconf for compilation: + +./configure --prefix=/usr \ + --disable-static \ + --docdir=/usr/share/doc/pkgconf-&pkgconf-version; + + Compile the package: + +make + + Install the package: + +make install + + To maintain compatibility with the original Pkg-config create two + symlinks: + +ln -sv pkgconf /usr/bin/pkg-config +ln -sv pkgconf.1 /usr/share/man/man1/pkg-config.1 + + + + + Contents of Pkgconf + + + Installed programs + Installed library + Installed directory + + + pkgconf, pkg-config (link to pkgconf), and bomtool + libpkgconf.so + /usr/share/doc/pkgconf-&pkgconf-version; + + + + + Short Descriptions + + + + + pkgconf + + Returns meta information for the specified library or + package + + pkgconf + + + + + + bomtool + + Generates a Software Bill Of Materials from pkg-config .pc + files + + bomtool + + + + + + libpkgconf + + Contains most of pkgconf's functionality, while allowing + other tools like IDEs and compilers to use its frameworks + + libpkgconf + + + + + + +
diff --git a/chapter08/pkgconfig.xml b/chapter08/pkgconfig.xml deleted file mode 100644 index b987a7652..000000000 --- a/chapter08/pkgconfig.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - %general-entities; -]> - - - - - - pkg-config - &pkgconfig-version; -
&pkgconfig-url;
-
- - Pkg-config-&pkgconfig-version; - - - Pkgconfig - - - - - - <para>The pkg-config package contains a tool for passing the include path - and/or library paths to build tools during the configure and make phases - of package installations.</para> - - <segmentedlist> - <segtitle>&buildtime;</segtitle> - <segtitle>&diskspace;</segtitle> - - <seglistitem> - <seg>&pkgconfig-fin-sbu;</seg> - <seg>&pkgconfig-fin-du;</seg> - </seglistitem> - </segmentedlist> - - </sect2> - - <sect2 role="installation"> - <title>Installation of Pkg-config - - Prepare Pkg-config for compilation: - -./configure --prefix=/usr \ - --with-internal-glib \ - --disable-host-tool \ - --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; - - - The meaning of the new configure options: - - - --with-internal-glib - - This will allow pkg-config to use its internal version of - Glib because an external version is not available in LFS. - - - - - --disable-host-tool - - This option disables the creation of an undesired hard link - to the pkg-config program. - - - - - - Compile the package: - -make - - To test the results, issue: - -make check - - Install the package: - -make install - - - - - Contents of Pkg-config - - - Installed program - Installed directory - - - pkg-config - /usr/share/doc/pkg-config-&pkgconfig-version; - - - - - Short Descriptions - - - - - - pkg-config - - Returns meta information for the specified library or package - - - pkg-config - - - - - - - - -
diff --git a/packages.ent b/packages.ent index c7046659e..315c67fc7 100644 --- a/packages.ent +++ b/packages.ent @@ -366,10 +366,10 @@ - - + + - + @@ -432,12 +432,12 @@ - + - + - +