Changeset 3b3e965d for chapter05

Timestamp:

05/30/2002 11:51:27 AM (22 years ago)

Author:

Gerard Beekmans <gerard@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, v4_0, v4_1, v5_0, v5_1, v5_1_1, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

5e84d79

Parents:

ca6391e

Message:

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

Location:

chapter05

Files:

• fileutils-exp.xml (modified) (1 diff)
• fileutils-inst.xml (modified) (2 diffs)

chapter05/fileutils-exp.xml

@@ -6 +6 @@
 change.</para>
 
-<para><userinput>cp lib/Makefile.in lib/Makefile.in.backup &amp;&amp;
-sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
-&nbsp;&nbsp;&nbsp;&nbsp;lib/Makefile.in.backup &gt; 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>

chapter05/fileutils-inst.xml

@@ -1 +1 @@
 <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
@@ -6 +10 @@
 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 &amp;&amp;
-sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \
-&nbsp;&nbsp;&nbsp;&nbsp;lib/Makefile.in.backup &gt; 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>