From c8ba565c4e262a4871a49a0543b5f76d93570a71 Mon Sep 17 00:00:00 2001 From: Zack Winkles Date: Mon, 3 May 2004 22:08:10 +0000 Subject: Committing current BE-LFS to head. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3452 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/adjusting.xml | 4 ++-- chapter05/bash.xml | 2 +- chapter05/gcc-pass2.xml | 2 +- chapter05/util-linux.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'chapter05') diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index b18b6f132..1f18d7cb2 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -38,7 +38,7 @@ to the new dynamic linker. A simple sed will accomplish this: -SPECFILE=/tools/lib/gcc-lib/*/*/specs && +SPECFILE=/tools/lib/gcc/*/*/specs && sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \ $SPECFILE > tempspecfile && mv -f tempspecfile $SPECFILE && @@ -62,7 +62,7 @@ because of GCC's fixincludes process which runs as part of the GCC build. We'll explain more about this further on in this chapter. For now, run the following commands to eliminate this possibility: -rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h} +rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h} It is imperative at this point to stop and ensure that the basic diff --git a/chapter05/bash.xml b/chapter05/bash.xml index d5d5ee747..53994cfa8 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -25,7 +25,7 @@ Bash contains several known bugs. Fix these with the following patch: -patch -Np1 -i ../bash-&bash-version;-2.patch +patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch Now prepare Bash for compilation: diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index fbf321af4..ed0d752c8 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -46,7 +46,7 @@ into a single gcc-&gcc-version;/ subdirectory. First correct a problem and make an essential adjustment: -patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch +patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch patch -Np1 -i ../gcc-&gcc-version;-specs-1.patch The first patch disables the GCC fixincludes script. We diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml index 7954b0f83..44ac77f81 100644 --- a/chapter05/util-linux.xml +++ b/chapter05/util-linux.xml @@ -25,7 +25,7 @@ Util-linux has issues with the Linux 2.6 kernel series - fix these issues by applying the following patch: -patch -Np1 -i ../util-linux-&util-linux-version;-kernel-dj-2.6-1.patch +patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch Util-linux doesn't use the freshly installed headers and libraries from the /tools directory. This is fixed by altering the configure -- cgit v1.2.3-54-g00ecf