From 678acc1775ba3760b1f56213b1db7d153c10b9bb Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 5 Aug 2024 12:02:35 +0800 Subject: [PATCH 1/3] toolchaintechnotes: Update the paragraph describing ch05 glibc We no longer pass CC="$LFS_TGT-gcc -nostdinc -isysroot" since cross-chap5. --- part3intro/toolchaintechnotes.xml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/part3intro/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml index 7997b0891..6deffe91c 100644 --- a/part3intro/toolchaintechnotes.xml +++ b/part3intro/toolchaintechnotes.xml @@ -359,20 +359,17 @@ checking what linker to use... /mnt/lfs/tools/i686-lfs-linux-gnu/bin/ldNext comes glibc. The most important considerations for building glibc are the compiler, binary tools, and - kernel headers. The compiler is generally not an issue since glibc will - always use the compiler relating to the --host + kernel headers. The compiler and binary tools are generally not an issue + since glibc will always those relating to the --host parameter passed to its configure script; e.g., in our case, the compiler - will be $LFS_TGT-gcc. The binary tools and kernel - headers can be a bit more complicated. Therefore, we take no risks and use - the available configure switches to enforce the correct selections. After + will be $LFS_TGT-gcc and the readelf + tool will be $LFS_TGT-readelf. The kernel headers can + be a bit more complicated. Therefore, we take no risks and use + the available configure switch to enforce the correct selection. After the run of configure, check the contents of the config.make file in the build directory for all important details. - Note the use of CC="$LFS_TGT-gcc" (with - $LFS_TGT expanded) to control which binary tools are used - and the use of the -nostdinc and - -isystem flags to control the compiler's include - search path. These items highlight an important aspect of the glibc + These items highlight an important aspect of the glibc package—it is very self-sufficient in terms of its build machinery, and generally does not rely on toolchain defaults. From 653ead1781c5dda7de0bd7395a5eeb89db7e2191 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 5 Aug 2024 12:08:18 +0800 Subject: [PATCH 2/3] toolchaintechnotes: Refer to Glibc wiki instead of shlib-versions The list of dynamic linkers is removed in shlib-versions since 2014. Link: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=ba90e05052ce --- part3intro/toolchaintechnotes.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/part3intro/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml index 6deffe91c..3714596fc 100644 --- a/part3intro/toolchaintechnotes.xml +++ b/part3intro/toolchaintechnotes.xml @@ -192,9 +192,9 @@ sure-fire way to determine the name of the dynamic linker is to inspect a random binary from the host system by running: readelf -l <name of binary> | grep interpreter and noting the - output. The authoritative reference covering all platforms is in the - shlib-versions file in the root of the glibc source - tree. + output. The authoritative reference covering all platforms is in + a Glibc wiki + page. In order to fake a cross-compilation in LFS, the name of the host triplet From dd151db302a14f62cbac4c8726a41e7cccd6f94d Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 5 Aug 2024 13:06:09 -0500 Subject: [PATCH 3/3] Package updates. Update to bash-5.2.32. Update to iana-etc-20240801. Update to vim-9.1.0660. Update to binutils-2.43. Update to linux-6.10.3. Update to readline-8.2.13. Update to wheel-0.44.0. --- chapter01/changelog.xml | 34 ++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 20 ++++++++++++-------- chapter03/patches.xml | 7 ++++--- chapter08/bash.xml | 4 ---- chapter08/readline.xml | 4 ---- packages.ent | 40 ++++++++++++++++++++-------------------- patches.ent | 7 ++++--- 7 files changed, 74 insertions(+), 42 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 439c9c0df..f3eafe40d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,40 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-08-05 + + + [bdubbs] - Update to bash-5.2.32. Fixes + #5532. + + + [bdubbs] - Update to iana-etc-20240801. Addresses + #5006. + + + [bdubbs] - Update to vim-9.1.0660. Addresses + #4500. + + + [bdubbs] - Update to binutils-2.43. Fixes + #5535. + + + [bdubbs] - Update to linux-6.10.3. Fixes + #5534. + + + [bdubbs] - Update to readline-8.2.13. Fixes + #5533. + + + [bdubbs] - Update to wheel-0.44.0. Fixes + #5536. + + + + 2024-08-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 11bad5db3..614ea5c9d 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -38,15 +38,15 @@ Automake-&automake-version; - + Bc-&bc-version; - + @@ -221,9 +221,9 @@ Python-&python-version; - + @@ -301,8 +301,12 @@ Removed: - - + + bash-5.2.21-upstream_fixes-1.patch + + + readline-8.2-upstream_fixes-3.patch + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index de4e0b529..ef00fbe5a 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -26,7 +26,7 @@ --> - + + SysVinit Consolidated Patch - &sysvinit-consolidated-patch-size;: diff --git a/chapter08/bash.xml b/chapter08/bash.xml index c217d5576..9dbcf7863 100644 --- a/chapter08/bash.xml +++ b/chapter08/bash.xml @@ -40,10 +40,6 @@ Installation of Bash - First, fix some issues identified upstream: - -patch -Np1 -i ../&bash-upstream-fixes-patch; - Prepare Bash for compilation: ./configure --prefix=/usr \ diff --git a/chapter08/readline.xml b/chapter08/readline.xml index d1c385bbc..882391cae 100644 --- a/chapter08/readline.xml +++ b/chapter08/readline.xml @@ -56,10 +56,6 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install sed -i 's/-Wl,-rpath,[^ ]*//' support/shobj-conf - Now fix a problem identified upstream: - -patch -Np1 -i ../&readline-fixes-patch; - Prepare Readline for compilation: ./configure --prefix=/usr \ diff --git a/packages.ent b/packages.ent index 26f0f3fb3..f583b777c 100644 --- a/packages.ent +++ b/packages.ent @@ -47,10 +47,10 @@ - - + + - + @@ -65,10 +65,10 @@ - - + + - + @@ -317,10 +317,10 @@ - + - + @@ -431,12 +431,12 @@ - + - + - + - + - + @@ -744,10 +744,10 @@ - + - + - + - - + + - + diff --git a/patches.ent b/patches.ent index 3dc18d14c..fbb773577 100644 --- a/patches.ent +++ b/patches.ent @@ -2,10 +2,11 @@ + @@ -29,11 +30,11 @@ - +