Changeset a2ae800

Timestamp:

12/07/2005 10:29:58 AM (18 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

cbf206e

Parents:

ea92fe5

Message:

Condensed the sed commands and changed a hard-coded GCC version to an entity in the cpio instructions

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5365 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/sysutils/cpio.xml (modified) (7 diffs)

general/sysutils/cpio.xml

@@ -6 +6 @@
 
   <!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
-  <!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
-  <!ENTITY cpio-md5sum "76b4145f33df088a5bade3bf4373d17d">
-  <!ENTITY cpio-size "561 KB">
-  <!ENTITY cpio-buildsize "5.3 MB">
-  <!ENTITY cpio-time "0.1 SBU">
+  <!ENTITY cpio-download-ftp  "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
+  <!ENTITY cpio-md5sum        "76b4145f33df088a5bade3bf4373d17d">
+  <!ENTITY cpio-size          "561 KB">
+  <!ENTITY cpio-buildsize     "5.3 MB">
+  <!ENTITY cpio-time          "0.1 SBU">
 ]>
 
@@ -25 +25 @@
   </sect1info>
 
-  <title>Cpio-&cpio-version;</title>
+  <title>cpio-&cpio-version;</title>
 
   <indexterm zone="cpio">
@@ -32 +32 @@
 
   <sect2 role="package">
-    <title>Introduction to Cpio</title>
+    <title>Introduction to cpio</title>
 
     <para>The <application>cpio</application> package contains
@@ -70 +70 @@
 
   <sect2 role="installation">
-    <title>Installation of Cpio</title>
+    <title>Installation of cpio</title>
 
     <para>Install <application>cpio</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c &amp;&amp;
+<screen><userinput>sed -i "s/invalid_arg/argmatch_invalid/" src/mt.c &amp;&amp;
 patch -Np1 -i ../cpio-&cpio-version;-security_fixes-1.patch &amp;&amp;
 ./configure CPIO_MT_PROG=mt --prefix=/usr \
@@ -85 +85 @@
 
     <para>To test the results, issue:</para>
-<screen><userinput>sed -i -e 's/static const char \*argp_program_version/ \
-                    const char \*argp_program_version/' \
-       -e 's/static const char \*argp_program_bug_address/ \
-                    const char \*argp_program_bug_address/' \
-        tests/genfile.c &amp;&amp;
+
+<screen><userinput>sed -i 's/static const char/const char/' tests/genfile.c &amp;&amp;
 make check</userinput></screen>
 
@@ -101 +98 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i -e "s/invalid_arg/argmatch_invalid/"
+    <para><command>sed -i "s/invalid_arg/argmatch_invalid/"
     src/mt.c</command>: This command fixes a build problem with the
     <command>mt</command> program.</para>
-
-
 
     <para><parameter>CPIO_MT_PROG=mt</parameter>: This parameter forces the
@@ -132 +127 @@
     into regular files during archive creation.</para>
 
-    <para><command>sed -i -e 's/static const ...</command>:  This command fixes a build problem when
-    compiling the tests with gcc-4.0.1</para>
+    <para><command>sed -i 's/static const ...</command>:  This command fixes
+    a build problem when compiling the tests with GCC-&gcc-version;.</para>
 
   </sect2>