From 9103be90053dff74a1bd88571a54093db9f3a65a Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Mon, 14 Apr 2025 18:02:27 -0600 Subject: [PATCH 1/7] chapter06/Diffutils: Elaborate what the sed does. --- chapter06/diffutils.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index c56b01c5a..8738e32b0 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -43,7 +43,10 @@ Installation of Diffutils - First, fix a problem in the current version of diffutils: + When Diffutils is being configured, it checks to see if it is + being cross compiled. If it is, configuration fails. Since we are + cross compiling, comment out the specific lines that perform that + test now: sed -e '46252,+3 s/^/#/' \ -e '46596,+3 s/^/#/' \ From cb6741b0fa2fc32d6e6683166f786d8a8e0cffc1 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 14 Apr 2025 22:10:25 +0800 Subject: [PATCH 2/7] general: Use "x.y-systemd" instead of "stable-systemd" in BLFS URL for release "stable-systemd" is the latest release, but we want to use the same version as the LFS book here. --- general.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general.ent b/general.ent index 09c98f613..27b62c37f 100644 --- a/general.ent +++ b/general.ent @@ -44,7 +44,7 @@ ]]> - + ]]> + gl_cv_func_strcasecmp_works=y + + This option specify the result of a check for the + strcasecmp. 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 + configure script would use a fall-back value + for cross-compilation, but the fall-back value for this check is + absent and the configure 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 + autoconf that the host distro may lack. So + we just specify the check result (y as we know + the strcasecmp function in + Glibc-&glibc-version; works fine) instead, then + configure will just use the specified value and + skip the check. + + + + Compile the package: make From fb602744bbcddcb8dbe579960cf86a7bcdf667dd Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 15 Apr 2025 19:47:48 +0800 Subject: [PATCH 4/7] Revert "Note that gperf tests only work with -j1." This reverts commit eb43115dec1f6057a4aaf1f161b0869ec8c4f7fa. Per https://savannah.gnu.org/bugs/?53208 the issue is fixed. I tried -j18 multiple times and observed no issues. --- chapter08/gperf.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/chapter08/gperf.xml b/chapter08/gperf.xml index bbfbbe735..25939135a 100644 --- a/chapter08/gperf.xml +++ b/chapter08/gperf.xml @@ -48,11 +48,9 @@ make - The tests are known to fail if running multiple - simultaneous tests (-j option greater than 1). To test - the results, issue: + To test the results, issue: -make -j1 check +make check Install the package: From 1a2d3f558830712ef22731798b6bb265684ed847 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 15 Apr 2025 20:42:11 +0800 Subject: [PATCH 5/7] whatsnew: Don't hard code version of packaging --- chapter01/whatsnew.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 4ab0abff3..d6d646f7b 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -294,7 +294,7 @@ - Packaging-24.2 + Packaging-&packaging-version; From c63e26b2968806cdfb74328eef4327e654b9248e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 15 Apr 2025 20:44:14 +0800 Subject: [PATCH 6/7] packaging: Captialize the title --- chapter08/packaging.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/packaging.xml b/chapter08/packaging.xml index b3e9e439d..f1a6def9c 100644 --- a/chapter08/packaging.xml +++ b/chapter08/packaging.xml @@ -43,7 +43,7 @@ - Installation of packaging + Installation of Packaging Compile packaging with the following command: From 97aaa219af80ba0f9b8646c2366fed34b59248fd Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 15 Apr 2025 10:11:29 -0500 Subject: [PATCH 7/7] Update currency adding 'packaging.' --- lfs-latest-git.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index d8da03ef5..a6723e909 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -139,6 +139,7 @@ if ( $package == "mpfr" ) $dirpath = "https://mpfr.loria.fr/mpfr-current"; if ( $package == "ncurses" ) $dirpath = "https://invisible-mirror.net/archives/ncurses"; if ( $package == "ninja" ) $dirpath = github("ninja-build/ninja"); if ( $package == "openssl" ) $dirpath = github("openssl/openssl"); +if ( $package == "packaging" ) $dirpath = "https://pypi.org/rss/project/packaging/releases.xml"; if ( $package == "procps-ng" ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags"; if ( $package == "psmisc" ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags"; if ( $package == "Python" ) $dirpath = "https://www.python.org/downloads/source/"; @@ -262,6 +263,9 @@ if ( $package == "zstd" ) $dirpath = github("facebook/zstd"); return find_max( $lines, "/wheel\/\d/", "/^.*wheel\/([\d\.]+).*$/" ); # End Python modules + if ( $package == "packaging" ) + return find_max( $lines, "/packaging/", "/^.*^.*packaging.([\d\.]+\d)\/.*$/" ); + if ( $package == "procps-ng" ) return find_max( $lines, "/v\d/", "/^.*v([\d\.]+)$/" );