Changeset 5f8327e

Timestamp:

11/03/2023 06:35:09 AM (11 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.1, 12.1-rc1, 12.2, 12.2-rc1, multilib, trunk, xry111/arm64, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/update-glibc

Children:

93311f4

Parents:

80321c6

git-author:

Xi Ruoyao <xry111@…> (11/03/2023 06:31:32 AM)

git-committer:

Xi Ruoyao <xry111@…> (11/03/2023 06:35:09 AM)

Message:

gawk: Fix "gawk-&gawk-version; is a remnant from Chapter 7" again

We'd fixed #5180 by forcing LN='ln -f'. But this has stopped to work
with gawk-5.2.2 (and 5.3.0) because now the building system explicitly
checks the existence of gawk-&gawk-version; and refuses to update it if
it exists.

Now removing the file before "make install" seems the easiest solution.

Link: ​https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=11762f4c0685

File:

• chapter08/gawk.xml (modified) (1 diff)

chapter08/gawk.xml

@@ -60 +60 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make LN='ln -f' install</userinput></screen>
+<screen><userinput remap="install">rm -f /usr/bin/gawk-&gawk-version;
+make install</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the overridden make variable:</title>
+      <title>The meaning of the command:</title>
 
       <varlistentry>
-        <term><envar>LN='ln -f'</envar></term>
+        <term><envar>rm -f /usr/bin/gawk-&gawk-version;</envar></term>
         <listitem>
-           <para>This variable ensures that the previous hard link installed
+           <para>The building system will not recreate the hard link
+           <filename>gawk-&gawk-version;</filename> if it already exists.
+           Remove it to ensure that the previous hard link installed
            in <xref linkend='ch-tools-gawk'/> is updated here.</para>
        </listitem>