diff options
author | Gerard Beekmans <gerard@linuxfromscratch.org> | 2002-05-30 11:51:27 +0000 |
---|---|---|
committer | Gerard Beekmans <gerard@linuxfromscratch.org> | 2002-05-30 11:51:27 +0000 |
commit | 3b3e965d2933fadf3933216cbf53373f7cfa1b8a (patch) | |
tree | d4c5aad73b462158b2b9751fa306375c9c0e0f2b /chapter05 | |
parent | ca6391e6590484cfb50a436acd844cd199b9e5d5 (diff) |
Fix bug #316 - replace sed's with patches. Done for c5-fileutils, c6-glibc, c6-gawk and c6-ed
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1947 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r-- | chapter05/fileutils-exp.xml | 12 | ||||
-rw-r--r-- | chapter05/fileutils-inst.xml | 29 |
2 files changed, 19 insertions, 22 deletions
diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml index 99bc82a1e..2accc77ed 100644 --- a/chapter05/fileutils-exp.xml +++ b/chapter05/fileutils-exp.xml @@ -5,14 +5,10 @@ run this command in order to keep a backup of the file we are about to change.</para> -<para><userinput>cp lib/Makefile.in lib/Makefile.in.backup && -sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \ - -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \ - lib/Makefile.in.backup > lib/Makefile.in:</userinput> -This is used to fix a problem with building fileutils statically on glibc 2.2.3 -systems. If this isn't done, then there is the possibility of all of the -fileutils programs causing segmentation faults once chroot is entered -in chapter 6.</para> +<para><userinput>patch -Np1 -i ../fileutils-&fileutils-version;.patch:</userinput> This is used to fix a problem with building fileutils statically on +glibc 2.2.3 systems. If this isn't done, then there is the possibility of +all of the fileutils programs causing segmentation faults once chroot is +entered in chapter 6.</para> </sect2> diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index adfff9733..ee0cbfc5d 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -1,30 +1,31 @@ <sect2> <title>Installation of Fileutils</title> +<para>This package requires its patch to be applied before you can +install it. Make sure it's unpacked before running the installation +commands.</para> + <para>The programs from a statically linked Fileutils package may cause segmentation faults on certain systems, if your distribution has Glibc-2.2.3 or higher installed. It seems to happen mostly on machines powered by an AMD CPU, but there is a case or two where an Intel system -is affected as well. If your system falls in this category, try the -following fix.</para> +is affected as well. If your system falls in this category, apply the +patch.</para> -<para>Note that in some cases using these sed commands will result in -not being able to compile this package at all, even when your -system has an AMD CPU and has Glibc-2.2.3 (or higher) installed. If that's -the case, you'll need to remove the fileutils-&fileutils-version; directory -and unpack it again from the tarball before continuing. We believe this -may be the case when your distribution has altered Glibc-2.2.3 somehow, -but details are unavailable at the time.</para> +<para>Note that in some cases using this patch will result in not being +able to compile this package at all, even when your system has an AMD CPU +and has Glibc-2.2.3 (or higher) installed. If that's the case, you'll need +to remove the fileutils-&fileutils-version; directory and unpack it again +from the tarball before continuing. We believe this may be the case when +your distribution has altered Glibc-2.2.3 somehow, but details are +unavailable at the time.</para> <para>To fix this package to compile properly on AMD/Glibc-2.2.3 -machines, run the following commands. Do <emphasis>not</emphasis> +machines, run the following command. Do <emphasis>not</emphasis> attempt this fix if you don't have Glibc-2.2.3 installed. It will more than likely result in all kinds of compile time problems.</para> -<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup && -sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \ - -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \ - lib/Makefile.in.backup > lib/Makefile.in</userinput></screen></para> +<para><screen><userinput>patch -Np1 -i ../fileutils-&fileutils-version;.patch</userinput></screen></para> <para>Install Fileutils by running the following commands:</para> |