Changeset 9c8dbc39

Timestamp:

08/12/2024 11:07:14 AM (5 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.2, lazarus, trunk, xry111/for-12.3

Children:

c48815ad

Parents:

53cd9807

Message:

zip: Simplify the instruction

"generic_gcc" is just a shorthand of "CC=gcc generic", so it's simpler
to just call "generic" directly when we want to override CC. Thus we no
longer need to use a sed.

File:

• general/sysutils/zip.xml (modified) (2 diffs)

general/sysutils/zip.xml

@@ -75 +75 @@
 
     <para>
-      First, make the package compatible with gcc-14:
-    </para>
-
-<screen><userinput>sed -i '205 s/CC=gcc/CC="gcc -std=gnu89"/' unix/Makefile</userinput></screen>
-
-    <para>
       Install <application>Zip</application> by running the following
       commands:
     </para>
 
-<screen><userinput>make -f unix/Makefile generic_gcc</userinput></screen>
+<screen><userinput>make -f unix/Makefile generic CC="gcc -std=gnu89"</userinput></screen>
 
     <para>
@@ -103 +97 @@
 
     <para>
-      <command>make prefix=/usr -f unix/Makefile install</command>: This
-      command overrides the <varname>prefix</varname> variable that is set to
+      <parameter>CC="gcc -std=gnu89"</parameter>: This parameter
+      overrides the <varname>CC</varname> variable that is set to
+      <command>cc</command> in the <filename>unix/Makefile</filename> file.
+      On LFS <command>cc</command> is a symlink to <command>gcc</command>,
+      and it uses <option>-std=gnu17</option> (ISO 9899:2017 with GNU
+      extensions) as the default but Zip is a <quote>legacy</quote> package
+      where some grammar constructs are invalid in ISO 9899:1999 and newer
+      standards.
+    </para>
+
+    <para>
+      <parameter>prefix=/usr</parameter>: This parameter
+      overrides the <varname>prefix</varname> variable that is set to
       <filename class='directory'>/usr/local</filename> in the
-      <filename>unix/Makefile</filename>.
-      Alternatives to <parameter>generic_gcc</parameter> can be seen with a
-      <command>make -f unix/Makefile list</command> command.
+      <filename>unix/Makefile</filename> file.
     </para>