Changeset 229d383c for general/prog

Timestamp:

08/21/2024 09:26:14 PM (4 weeks ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

12.2, lazarus, trunk

Children:

d8275c4

Parents:

c592b920

Message:

Subversion: fix building with GCC-14.

This was a relatively complicated fix, especially since you need to
forcibly regenerate the build system.

File:

• general/prog/subversion.xml (modified) (2 diffs)

general/prog/subversion.xml

@@ -79 +79 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Required patch for building with <xref linkend="apr"/>:
+          Required patch:
           <ulink url="&patch-root;/subversion-&subversion-version;-apr_1.7.0_fix-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
 
@@ -163 +163 @@
 
     <para>
-      Next, adapt the Ruby bindings to ruby-3.2 and later:
-    </para>
-
-    <screen><userinput remap="pre">sed -e 's/File.exists?/File.exist?/'               \
-    -i subversion/bindings/swig/ruby/svn/util.rb   \
-       subversion/bindings/swig/ruby/test/test_wc.rb</userinput></screen>
+      Next, fix building this package with GCC 14:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../subversion-&subversion-version;-upstream_fixes-1.patch</userinput></screen>
+
+    <para>
+      After modifying the SWIG bindings like we did with the patch, the build
+      system must be regenerated so the bindings pick up the changes:
+    </para>
+
+<screen><userinput remap="pre"> touch build/generator/swig/*.py &amp;&amp;
+mv -v build-outputs.mk{,.old}   &amp;&amp;
+./autogen.sh --release</userinput></screen>
 
     <para>