Changeset de3414e2 for chapter05

Timestamp:

08/28/2001 01:31:10 AM (23 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, 12.2, 12.2-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, v3_0, v3_1, v3_2, v3_3, 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/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

a7213af

Parents:

b5cb6b6

Message:

Transformed the two sed commands into one sed that does both

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1080 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter05

Files:

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

chapter05/fileutils-exp.xml

@@ -6 +6 @@
 change.</para>
 
-<para><screen><userinput>sed 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; tmp &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;tmp &gt; lib/Makefile.in : </userinput></screen> This 
-is used to fix a problem with building fileutils statically on glibc 2.2.3 
+<para><screen><userinput>cp -f lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
+<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
+<userinput>mv lib/Makefile.in~ lib/Makefile.in:</userinput></screen>
+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 

chapter05/fileutils-inst.xml

@@ -9 +9 @@
 
 <screen><userinput>cp -f lib/Makefile.in lib/Makefile.in.backup &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; tmp &amp;&amp;</userinput>
-<userinput>sed 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;tmp &gt; lib/Makefile.in</userinput></screen></para>
+<userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;-e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;lib/Makefile.in &gt; lib/Makefile.in~ &amp;&amp;</userinput>
+<userinput>mv lib/Makefile.in~ lib/Makefile.in</userinput></screen></para>
 
 <para>Install fileutils by running the following commands: