From 7b8fc8a44b732908fdb4345e101b6bcf759ae4b9 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Fri, 28 May 2021 19:45:39 -0500 Subject: Add sysconfdir for e2fsprogs. --- chapter8/e2fsprogs.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'chapter8') diff --git a/chapter8/e2fsprogs.sh b/chapter8/e2fsprogs.sh index b994c4e..4c2619e 100644 --- a/chapter8/e2fsprogs.sh +++ b/chapter8/e2fsprogs.sh @@ -7,6 +7,7 @@ cd build || exit 1 ../configure --prefix=/usr \ --bindir=/bin \ --with-root-prefix="" \ + --sysconfdir=/etc \ --enable-elf-shlibs \ --disable-libblkid \ --disable-libuuid \ -- cgit v1.2.3-54-g00ecf From 64ba00afc7d9bd36fcce41108ef11b3774f0fbfe Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 1 Jun 2021 10:48:31 -0500 Subject: Use bash fixes-2 patch. --- chapter6/bash.sh | 2 +- chapter8/bash.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chapter8') diff --git a/chapter6/bash.sh b/chapter6/bash.sh index 9251a89..7d080f2 100644 --- a/chapter6/bash.sh +++ b/chapter6/bash.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && +patch -Np1 -i ../bash-"${VERSION}"-fixes-2.patch && ./configure --prefix=/usr \ --build="$(support/config.guess)" \ --host="${LFS_TGT}" \ diff --git a/chapter8/bash.sh b/chapter8/bash.sh index 92402e5..96d3db1 100644 --- a/chapter8/bash.sh +++ b/chapter8/bash.sh @@ -1,7 +1,7 @@ #!/bin/bash # shellcheck disable=SC2016 -patch -Np1 -i ../bash-"${VERSION}"-fixes-1.patch && +patch -Np1 -i ../bash-"${VERSION}"-fixes-2.patch && sed -i '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in && -- cgit v1.2.3-54-g00ecf From 021e47332465d1e1ce02ec3fe6c360aab88d9c34 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Tue, 1 Jun 2021 14:12:52 -0500 Subject: Remove termlib and tic-depends and tinfo. --- chapter8/ncurses.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'chapter8') diff --git a/chapter8/ncurses.sh b/chapter8/ncurses.sh index 94d1b3c..c7ba368 100644 --- a/chapter8/ncurses.sh +++ b/chapter8/ncurses.sh @@ -7,16 +7,14 @@ set -e --without-debug \ --without-normal \ --enable-pc-files \ - --enable-widec \ - --with-termlib \ - --disable-tic-depends && + --enable-widec && make && make -j1 install && mv -v /usr/lib/libncursesw.so.6* /lib && ln -sfv ../../lib/"$(readlink /usr/lib/libncursesw.so)" /usr/lib/libncursesw.so && -for lib in ncurses form panel menu tinfo ; do +for lib in ncurses form panel menu ; do rm -vf /usr/lib/lib"${lib}".so && echo "INPUT(-l${lib}w)" > /usr/lib/lib"${lib}".so && ln -sfv "${lib}"w.pc /usr/lib/pkgconfig/"${lib}".pc -- cgit v1.2.3-54-g00ecf From dd19bb017278a95d28b2fe12f11be60ac5ae7d31 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 2 Jun 2021 11:44:01 -0500 Subject: Don't use hardcoded versions. --- chapter8/cleanup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chapter8') diff --git a/chapter8/cleanup.sh b/chapter8/cleanup.sh index 12bbae4..9ca1b07 100644 --- a/chapter8/cleanup.sh +++ b/chapter8/cleanup.sh @@ -26,7 +26,7 @@ else #sudo rm -rfv "${LFS}"/usr/share/man # Place debugging symbols for selected libraries in seprate files - save_lib="ld-2.33.so libc-2.33.so libpthread-2.33.so libthread_db-1.0.so" + save_lib="ld-?.*.so libc-?.*.so libpthread-?.*.so libthread_db-?.?.so" pushd "${LFS}"/lib || exit 1 for LIB in $save_lib; do @@ -37,7 +37,7 @@ else popd || exit 1 - save_usrlib="libquadmath.so.0.0.0 libstdc++.so.6.0.28 libitm.so.1.0.0 libatomic.so.1.2.0" + save_usrlib="libquadmath.so.?.?.? libstdc++.so.?.?.* libitm.so.?.?.? libatomic.so.?.?.?" pushd "${LFS}"/usr/lib || exit 1 -- cgit v1.2.3-54-g00ecf From 61cc34822407ff953687148c4419ba8a9db720c8 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Wed, 2 Jun 2021 16:02:35 -0500 Subject: Remove DOCDIR variable and copy a couple files instead. --- chapter8/iproute2.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chapter8') diff --git a/chapter8/iproute2.sh b/chapter8/iproute2.sh index 8612d5d..b63c58a 100644 --- a/chapter8/iproute2.sh +++ b/chapter8/iproute2.sh @@ -8,4 +8,6 @@ sed -i 's/.m_ipt.o//' tc/Makefile && make && -make DOCDIR=/usr/share/doc/iproute2-"${VERSION}" -j1 install +make -j1 install +mkdir -v /usr/share/doc/iproute2-"${VERSION}" +cp -v COPYING README* /usr/share/doc/iproute2-"${VERSION}" -- cgit v1.2.3-54-g00ecf From f6e5ab2942b6bbcb37bbbbe7ded569a1eb376cb4 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Thu, 3 Jun 2021 11:01:27 -0500 Subject: Remove reverted header change and enable optimizations. --- chapter8/python.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chapter8') diff --git a/chapter8/python.sh b/chapter8/python.sh index 04af366..f807d53 100644 --- a/chapter8/python.sh +++ b/chapter8/python.sh @@ -1,13 +1,12 @@ #!/bin/bash set -e -sed 's|cpython/||' -i Include/cpython/pystate.h && - ./configure --prefix=/usr \ --enable-shared \ --with-system-expat \ --with-system-ffi \ - --with-ensurepip=yes && + --with-ensurepip=yes \ + --enable-optimizations && make && -- cgit v1.2.3-54-g00ecf