From 36c4569b9f7661625e12e2bdca4bc94838fe2a18 Mon Sep 17 00:00:00 2001 From: Rahul Chandra Date: Sat, 17 Jun 2023 15:08:36 +0800 Subject: [PATCH] Replace pkg-config with pkgconf --- appendices/dependencies.xml | 18 +++--- chapter01/changelog.xml | 10 +++ chapter03/packages.xml | 8 +-- chapter08/chapter08.xml | 3 +- chapter08/pkgconf.xml | 122 ++++++++++++++++++++++++++++++++++++ chapter08/pkgconfig.xml | 121 ----------------------------------- packages.ent | 14 ++--- 7 files changed, 152 insertions(+), 144 deletions(-) create mode 100644 chapter08/pkgconf.xml delete mode 100644 chapter08/pkgconfig.xml diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 204ef4c78..f7d0606d1 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1607,7 +1607,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 @@ -2484,9 +2484,9 @@ - Pkg-config + Pkgconf - + &dependencies; Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, @@ -2494,33 +2494,31 @@ - + &runtime; Glibc - + &testsuites; None - + &before; Kmod - + &external; - - Glib2 - + None diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8d3e1de56..03732c156 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + + 2023-06-17 + + + [rahul] - Changed from pkg-config to pkgconf 1.9.5. + + + + 2023-06-09 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/pkgconf.xml b/chapter08/pkgconf.xml new file mode 100644 index 000000000..73630f817 --- /dev/null +++ b/chapter08/pkgconf.xml @@ -0,0 +1,122 @@ + + + %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 a + symlink: + +ln -sfv pkgconf /usr/bin/pkg-config + + + + + 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..fb731435c 100644 --- a/packages.ent +++ b/packages.ent @@ -566,13 +566,13 @@ - - - - - - - + + + + + + +