diff options
| author | Zack Winkles <winkie@linuxfromscratch.org> | 2004-05-03 22:08:10 +0000 |
|---|---|---|
| committer | Zack Winkles <winkie@linuxfromscratch.org> | 2004-05-03 22:08:10 +0000 |
| commit | c8ba565c4e262a4871a49a0543b5f76d93570a71 (patch) | |
| tree | 37df7ae08f43d9778f420495fc74f25f1dc6d139 /chapter05 | |
| parent | 9dfc02ff38f26117daffe7d8b822ebb64a3fed04 (diff) | |
Committing current BE-LFS to head.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3452 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
| -rw-r--r-- | chapter05/adjusting.xml | 4 | ||||
| -rw-r--r-- | chapter05/bash.xml | 2 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 2 | ||||
| -rw-r--r-- | chapter05/util-linux.xml | 2 |
4 files changed, 5 insertions, 5 deletions
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:</para> <!-- Ampersands are needed to allow cut and paste --> -<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs && +<screen><userinput>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 <quote>fixincludes</quote> 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:</para> -<screen><userinput>rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen> +<screen><userinput>rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen> <caution><para>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 @@ <para>Bash contains several known bugs. Fix these with the following patch:</para> -<screen><userinput>patch -Np1 -i ../bash-&bash-version;-2.patch</userinput></screen> +<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch</userinput></screen> <para>Now prepare Bash for compilation:</para> 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 <filename>gcc-&gcc-version;/</filename> subdirectory.</para> <para>First correct a problem and make an essential adjustment:</para> -<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch +<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch patch -Np1 -i ../gcc-&gcc-version;-specs-1.patch</userinput></screen> <para>The first patch disables the GCC <quote>fixincludes</quote> 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 @@ <para>Util-linux has issues with the Linux 2.6 kernel series - fix these issues by applying the following patch:</para> -<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-dj-2.6-1.patch</userinput></screen> +<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch</userinput></screen> <para>Util-linux doesn't use the freshly installed headers and libraries from the /tools directory. This is fixed by altering the configure |