From 7eb51d81234cb005e460f98f6792c95319fc622b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Wed, 4 Jun 2025 16:01:17 +0800 Subject: [PATCH 1/4] libpipeline: Remove make check Those tests need libcheck, thus make check is now a no-op. --- chapter08/libpipeline.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chapter08/libpipeline.xml b/chapter08/libpipeline.xml index a1be58923..2968714c7 100644 --- a/chapter08/libpipeline.xml +++ b/chapter08/libpipeline.xml @@ -49,9 +49,8 @@ make - To test the results, issue: - -make check + The tests require the Check library + that we've removed from LFS. Install the package: From 5544caf28ed7450201b0fc20dff22e5d7cccb9a3 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 5 Jun 2025 11:27:40 -0500 Subject: [PATCH 2/4] Typos --- chapter01/changelog.xml | 2 +- chapter08/gmp.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0b6f140b8..f37bf145b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -93,7 +93,7 @@ #5734. - [bdubbs] - Update build instructions to accomodate + [bdubbs] - Update build instructions to accommodate gcc-15 for bc, expect, ncurses, and gmp. diff --git a/chapter08/gmp.xml b/chapter08/gmp.xml index f0f0a8b3b..19eefce0a 100644 --- a/chapter08/gmp.xml +++ b/chapter08/gmp.xml @@ -62,7 +62,7 @@ CFLAGS is still automatically set to -march=something. --> - First, make an adjustment for compatibilty with gcc-15 and later: + First, make an adjustment for compatibility with gcc-15 and later: sed -i '/long long t1;/,+1s/()/(...)/' configure From 5e4ff8cb2e04ddadea4f0401725caeb4c32a0ee9 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Fri, 13 Jun 2025 15:52:08 +0200 Subject: [PATCH 3/4] Fix "Too many levels of symbolic links" in chapter 8 ncurses The problem is that TIC_PATH is nor honored anymore in chapter 6, so that tic from the host is used to create the terminfo database in chapter 6. The problem is that old versions of tic create symlinks in the database, while newer versions create hardlinks. Since we use a DESTDIR install in chapter 8 (with a recent version of ncurses, so with hardlinks), and copy it in place with cp -a, then it seems that copying hardlinks to symlinks. If an old version of tic has been used in chapter 6, this copies hardlinks to symlinks, which creates symlinks pointing to themselves (cp bug?). Anyway, the solution is to copy the auxilliary tic built in chapter 6 to $LFS/tools/bin (suggestion by Xi Ruoyao). Now, there is no need to set TIC_PATH or whatever because this tic is in the PATH. Bug first reported by Marcin Dulak. Analysis with the help of Bruce Dubbs and Thomas Trepl. Fixes https://wiki.linuxfromscratch.org/lfs/ticket/5744 --- chapter06/ncurses.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 2d2baf7dc..a29bcea7f 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -44,13 +44,16 @@ Installation of Ncurses First, run the following commands to build the tic - program on the build host: + program on the build host. We install it in + $LFS/tools, so that it is found + in the PATH when needed: mkdir build pushd build - ../configure AWK=gawk + ../configure --prefix=$LFS/tools AWK=gawk make -C include make -C progs tic + install progs/tic $LFS/tools/bin popd Prepare Ncurses for compilation: @@ -147,28 +150,14 @@ popd Install the package: -make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install +make DESTDIR=$LFS install ln -sv libncursesw.so $LFS/usr/lib/libncurses.so sed -e 's/^#if.*XOPEN.*$/#if 1/' \ -i $LFS/usr/include/curses.h - The meaning of the install options: - - TIC_PATH=$(pwd)/build/progs/tic - - We need to pass the path of the newly built - tic program that runs on the building machine, so - the terminal database can be created without errors. - - - ln -sv libncursesw.so $LFS/usr/lib/libncurses.so From 8d7dc4ebeac5feb2a60552e90f9169054435e6b6 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sat, 14 Jun 2025 12:26:22 -0500 Subject: [PATCH 4/4] Package updates. Update to meson-1.8.2. Update to linux-6.15.2. Update to libffi-3.5.1. Update to iproute2-6.15.0. Update to Python-3.13.5. --- chapter01/changelog.xml | 26 ++++++++++++++++++++++++++ packages.ent | 36 ++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f37bf145b..57b38f050 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,32 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2025-06-25 + + + [bdubbs] - Update to meson-1.8.2. Fixes + #5743. + + + [bdubbs] - Update to linux-6.15.2. Fixes + #5725. + + + [bdubbs] - Update to libffi-3.5.1. Fixes + #5741. + + + [bdubbs] - Update to iproute2-6.15.0. Fixes + #5732. + + + [bdubbs] - Update to Python-3.13.5. Fixes + #6743. + + + + 2025-06-04 diff --git a/packages.ent b/packages.ent index e5f65b299..e24f518c9 100644 --- a/packages.ent +++ b/packages.ent @@ -333,10 +333,10 @@ - - + + - + @@ -389,10 +389,10 @@ - - + + - + @@ -422,13 +422,13 @@ - - + + - + - + - + - + - + - - + +