From 9da9d0146ae0cd9daae4c9b61c73f4671028408a Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Wed, 3 Feb 2021 08:02:01 +0000 Subject: [PATCH] Merge changes from trunk to multilib git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12118 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- bootscripts/ChangeLog | 3 + bootscripts/lfs/init.d/mountfs | 3 +- chapter01/changelog.xml | 33 +++++++++ chapter01/whatsnew.xml | 4 +- chapter06/binutils-pass2.xml | 16 ++++- chapter06/chapter06.xml | 2 +- chapter06/file.xml | 16 ++++- chapter06/ncurses.xml | 2 + chapter06/zlib.xml | 122 --------------------------------- chapter08/bc.xml | 4 -- chapter08/chapter08.xml | 10 +-- chapter08/gcc.xml | 5 +- chapter08/glibc.xml | 14 ++-- chapter08/tcl.xml | 5 +- general.ent | 6 +- packages.ent | 14 ++-- 16 files changed, 94 insertions(+), 165 deletions(-) delete mode 100644 chapter06/zlib.xml diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index fd43c1222..f9e0a5ef4 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,6 @@ +2021-02-01 Bruce Dubbs + * Tweak mountfs to properly exit when an error is found. + 2021-01-13 Xi Ruoyao * Use /run instead of deprecated /var/run diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs index 185a0ab7a..6bf2d6f2f 100644 --- a/bootscripts/lfs/init.d/mountfs +++ b/bootscripts/lfs/init.d/mountfs @@ -46,7 +46,8 @@ case "${1}" in # their option list. _netdev denotes a network filesystem. log_info_msg "Mounting remaining file systems..." - mount --all --test-opts no_netdev >/dev/null + failed=0 + mount --all --test-opts no_netdev >/dev/null || failed=1 evaluate_retval exit $failed ;; diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 590106985..242ea5df6 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,39 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + + 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] - To allow building with newer version of glibc + than the host distribution, build a "file" executable for the + host before cross-compiling it. + + + [pierre] - Replace the relinked libctf (which may incorrectly + link against libz from the host distribution) with the one that + was linked during "make" in binutils-pass2. + + + [bdubbs] - Update to bc-3.2.6. Fixes + #4800. + + + [bdubbs] - Update to glibc-2.33. Fixes + #4799. + + + [bdubbs] - Minor change to mountfs boot script. Fixes + #4798. + + + + 2021-02-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 701b2e998..9c2f6bd37 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -105,9 +105,9 @@ - + GMP-&gmp-version; diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index 671931c38..3b8d34228 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -101,9 +101,21 @@ cd build make - Install the package: + Install the package, and + workaround an issue causing + libctf.so + to link against zlib from the host distribution: -make DESTDIR=$LFS install +make DESTDIR=$LFS install +install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib + + + Workaround an issue causing + libctf.so + to link against zlib from the host distribution: + + +install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 11bc5d499..366e9a8ab 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -22,7 +22,7 @@ - + diff --git a/chapter06/file.xml b/chapter06/file.xml index 035e02f72..c9fbe0e6f 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -43,9 +43,21 @@ Installation of File + + The file command on the build host needs + to be same version as the one we are building in order to + create 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 +./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess) Compile the package: -make +make FILE_COMPILE=$(pwd)/build/src/file Install the package: diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 6363dd88f..a073ad88a 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -177,6 +177,7 @@ echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so CXX="$LFS_TGT-g++ -m32" \ ./configure --prefix=/usr \ --host=$LFS_TGT32 \ + --build=$(./config.guess) \ --libdir=&usr-lib-m32; \ --mandir=/usr/share/man \ --with-shared \ @@ -216,6 +217,7 @@ rm -rf DESTDIR CXX="$LFS_TGT-g++ -mx32" \ ./configure --prefix=/usr \ --host=$LFS_TGTX32 \ + --build=$(./config.guess) \ --libdir=&usr-lib-mx32; \ --mandir=/usr/share/man \ --with-shared \ diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml deleted file mode 100644 index 416531ca0..000000000 --- a/chapter06/zlib.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - %general-entities; -]> - - - - - - zlib - &zlib-version; -
&zlib-url;
- - - Zlib-&zlib-version; - - - Zlib - - - - - - <para>The Zlib package contains compression and decompression routines used by - some programs.</para> - - <segmentedlist> - <segtitle>&buildtime;</segtitle> - <segtitle>&diskspace;</segtitle> - - <seglistitem> - <seg>&zlib-fin-sbu;</seg> - <seg>&zlib-fin-du;</seg> - </seglistitem> - </segmentedlist> - - </sect2> - - <sect2 role="installation"> - <title>Installation of Zlib - - Prepare Zlib for compilation: - -./configure --prefix=/usr - - Compile the package: - -make - - Install the package: - -make DESTDIR=$LFS install -mv -v $LFS/usr/lib/libz.so.* $LFS/lib -ln -sfv ../../lib/$(readlink $LFS/usr/lib/libz.so) $LFS/usr/lib/libz.so - - - - - - - - - Installation of Zlib - 32bit - - Clean previous build: - -make distclean - - Prepare Zlib for compilation: - -CC="gcc -m32" \ -./configure --prefix=/usr \ - --libdir=&usr-lib-m32; - - Compile the package: - -make - - Install the package: - -make DESTDIR=$PWD/DESTDIR install -cp -Rv DESTDIR&usr-lib-m32;/* $LFS&usr-lib-m32; -rm -rf DESTDIR - - - - - - - - - Installation of Zlib - x32bit - -make distclean - - Prepare Zlib for compilation: - -CC="gcc -mx32" \ -./configure --prefix=/usr \ - --libdir=&usr-lib-mx32; - - Compile the package: - -make - - Install the package: - -make DESTDIR=$PWD/DESTDIR install -cp -Rv DESTDIR&usr-lib-mx32;/* $LFS&usr-lib-mx32; -rm -rf DESTDIR - - - - - - <para>Details on this package are located in <xref linkend="contents-zlib" role="."/></para> - - </sect2> - -</sect1> diff --git a/chapter08/bc.xml b/chapter08/bc.xml index b116fe10e..dfff0364f 100644 --- a/chapter08/bc.xml +++ b/chapter08/bc.xml @@ -41,10 +41,6 @@ <sect2 role="installation"> <title>Installation of Bc - First, fix an error in the configure script:: - -sed -i '612d' configure.sh - Prepare Bc for compilation: PREFIX=/usr CC=gcc ./configure.sh -G -O3 diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index 70ab37feb..2f6884d3b 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -14,11 +14,6 @@ - - - - - @@ -30,6 +25,11 @@ + + + + + diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml index a562e8b18..cce33284a 100644 --- a/chapter08/gcc.xml +++ b/chapter08/gcc.xml @@ -143,7 +143,7 @@ su tester -c "PATH=$PATH make -k check" apparently related to the en_HK locale. Additionally the following tests related to the following files - are known to fail with glibc-2.32: asan_test.C, co-ret-17-void-ret-coro.C, + are known to fail with glibc-2.33: asan_test.C, co-ret-17-void-ret-coro.C, pr95519-05-gro.C, pr80166.c. -case $(uname -m) in + make check You may see some test failures. The Glibc test suite is @@ -159,18 +159,12 @@ esac misc/tst-ttyname is known to fail in the LFS chroot environment. - + The nss/tst-nss-files-hosts-multi test may fail for reasons that have not been determined. 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. - + - + diff --git a/packages.ent b/packages.ent index 118d58aba..510393fa1 100644 --- a/packages.ent +++ b/packages.ent @@ -57,10 +57,10 @@ - - + + - + @@ -256,10 +256,10 @@ - - + + - + @@ -383,7 +383,7 @@ - +