Changeset c2f825a

Timestamp:

09/17/2024 05:50:09 AM (4 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

lazarus, trunk

Children:

144cfb1

Parents:

1722fa1

git-author:

Xi Ruoyao <xry111@…> (09/17/2024 05:48:01 AM)

git-committer:

Xi Ruoyao <xry111@…> (09/17/2024 05:50:09 AM)

Message:

Revert "libarchive: Disable buggy expat support"

This reverts commit 6cfc907ac4a2e2a8c85c7fccb482c7d9cf5a314f.

The expat bug is fixed in libarchive-3.7.5.

File:

• general/genlib/libarchive.xml (modified) (3 diffs)

general/genlib/libarchive.xml

@@ -80 +80 @@
     <bridgehead renderas="sect3">libarchive Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxml2"/>
-    </para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="libxml2"/>,
       <xref linkend="lzo"/>, 
       <xref linkend="nettle"/>, and
@@ -101 +97 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static --without-expat &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -122 +118 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <!-- https://github.com/libarchive/libarchive/issues/2146 -->
-    <para>
-      <parameter>--without-expat</parameter>: This switch disables using
-      expat for xar format support.  Due to a bug the xar reader will loop
-      infinitely if expat is used.  The upstream prefers libxml2 for xar
-      support anyway.
-    </para>
-<!--
-    <para>
-      <option>- -without-xml2</option>: This switch sets expat for xar archive
+    <para>
+      <option>--without-xml2</option>: This switch sets expat for xar archive
       format support instead of preferred libxml2 if both packages are installed.
     </para>
--->
+
     <para>
       <option>--without-nettle</option>: This switch sets OpenSSL for crypto