From df2e99e94db203e66a798ef7f070d6e96560e8e7 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 2 Feb 2021 21:35:59 +0000 Subject: Really apply various fixes for building with glibc-2.33, and change the order in chapter 8 so that everything is built against chapter 8 glibc. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12112 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 11 +++++++++++ chapter06/binutils-pass2.xml | 3 ++- chapter06/file.xml | 12 +++++++++++- chapter08/chapter08.xml | 10 +++++----- chapter08/glibc.xml | 4 ++-- chapter08/tcl.xml | 5 ++--- 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0036d3e65..0d550b172 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -45,6 +45,17 @@ 2021-02-02 + + [pierre] - Move tcl, expect, and dejagnu just before binutils + in chapter 8: this allows to build them against chapter 8 + glibc. + + + [pierre] - Tweaks to allow building with glibc-2.33: + build a "file" executable for the host before cross-compiling + it; replace the relinked libctf with the one that was linked + during "make" in binutils-pass2. + [bdubbs] - Update to bc-3.2.6. Fixes #4800. diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index 9361c6717..4cd09fc88 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -87,7 +87,8 @@ cd build Install the package: -make DESTDIR=$LFS install +make DESTDIR=$LFS install +install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib Workaround an issue causing diff --git a/chapter06/file.xml b/chapter06/file.xml index 0d00a1848..f46f3295d 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -43,6 +43,16 @@ Installation of File + The build host file command iwith the same version as + the one we are building is needed for building the signature file. Run the + following commands to build it: + +mkdir build +pushd build +../configure +make +popd + Prepare File for compilation: ./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess) @@ -54,7 +64,7 @@ cross-compiling, and use the just built "file". --> Compile the package: -make +make FILE_COMPILE=$(pwd)/build/src/file Install the package: diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index cd8173536..3cfa0b660 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -14,11 +14,6 @@ - - - - - @@ -30,6 +25,11 @@ + + + + + diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index dc3d5ecee..6432881cf 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -126,7 +126,7 @@ cd build are usually safe to ignore. -case $(uname -m) in + make check You may see some test failures. The Glibc test suite is diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml index f9ad17937..6b3aef0f5 100644 --- a/chapter08/tcl.xml +++ b/chapter08/tcl.xml @@ -45,11 +45,10 @@ Installation of Tcl This package and the next two (Expect and DejaGNU) are - installed to support running the test suites for GCC and binutils and other + installed to support running the test suites for binutils and GCC and other packages. Installing three packages for testing purposes may seem excessive, but it is very reassuring, if not essential, to know that the - most important tools are working properly. These packages are required - to run the test suites in this chapter. + most important tools are working properly.