Author: renodr
Date: Wed Aug  7 13:52:11 2019
New Revision: 21907

Log:
Fix subversion to work with SWIG-4 again

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/subversion.xml
   trunk/BOOK/introduction/welcome/changelog.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Tue Aug  6 20:11:05 2019        (r21906)
+++ trunk/BOOK/general.ent      Wed Aug  7 13:52:11 2019        (r21907)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 6th, &year;">
+<!ENTITY releasedate  "August 7th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/general/prog/subversion.xml
==============================================================================
--- trunk/BOOK/general/prog/subversion.xml      Tue Aug  6 20:11:05 2019        
(r21906)
+++ trunk/BOOK/general/prog/subversion.xml      Wed Aug  7 13:52:11 2019        
(r21907)
@@ -166,16 +166,14 @@
       First, apply a patch to fix building against <xref linkend="apr"/>:
     </para>
 
-<screen><userinput>patch -Np1 -i 
../subversion-&subversion-version;-apr_1.7.0_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i 
../subversion-&subversion-version;-apr_1.7.0_fix-1.patch</userinput></screen> 
-->
 
     <para>
-      Next, apply some fixes to adapt subversion to <xref linkend="swig"/>:
+      First, apply a fix to adapt subversion to <xref linkend="swig"/>:
     </para>
  
-<screen><userinput>sed -i '/define.*MEMORY/a#define SWIG_POINTER_NO_NULL 0x4' \
-   subversion/bindings/swig/proxy/swigrun.swg &amp;&amp;
-sed -i 's/classic/nofastunpack/' build.conf</userinput></screen>
--->
+<screen><userinput remap="pre">sed -i 's/classic/nofastunpack/' 
build.conf</userinput></screen>
+
     <para>
       Install <application>Subversion</application> by running the following
       commands:
@@ -242,11 +240,11 @@
       <command>make check-swig-rb</command>.
     </para>
 
-    <para>
+    <note><para>
       The Python Bindings test suite (<command>make check-swig-py</command>)
       is broken with SWIG-4.0.0, however the bindings themselves work as
       expected.
-    </para>
+    </para></note>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Tue Aug  6 20:11:05 
2019        (r21906)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed Aug  7 13:52:11 
2019        (r21907)
@@ -41,6 +41,15 @@
       </itemizedlist>
     </listitem>
        -->
+    <listitem>
+      <para>August 7th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt Subversion to changes in SWIG-4.0.0
+          again.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>August 6th, 2019</para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to