Changeset 466d85a


Ignore:
Timestamp:
12/21/2013 12:08:21 PM (9 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
f8d89d4
Parents:
01832bf
Message:

Move swig and python to optional in subversion

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12423 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/prog/subversion.xml

    r01832bf r466d85a  
    8888    <bridgehead renderas="sect4">Recommended</bridgehead>
    8989    <para role="recommended">
    90       <xref linkend="openssl"/>,
    91       <xref linkend="python2"/> (with sqlite support for the tests),
    92       <xref linkend="serf"/> (for handling http:// and https:// URLs), and
    93       <xref linkend="swig"/> (for building Perl, Python and optionally Ruby
    94       bindings)
     90      <xref linkend="openssl"/> and
     91      <xref linkend="serf"/> (for handling http:// and https:// URLs)
    9592    </para>
    9693
     
    115112      <xref linkend="dbus"/>,
    116113      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support),
    117       <xref linkend="ruby"/>
     114      <xref linkend="python2"/> (with sqlite support for the tests),
     115      <xref linkend="ruby"/>, and
     116      <xref linkend="swig"/> (for building Perl, Python and Ruby bindings)
    118117    </para>
    119118
     
    139138    </para>
    140139
    141 <screen><userinput>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in &amp;&amp;
    142 ./configure --prefix=/usr    \
     140<screen><userinput>./configure --prefix=/usr    \
    143141            --disable-static \
    144142            --with-apache-libexecdir &amp;&amp;
    145 make &amp;&amp;
    146 make swig-pl &amp;&amp;
    147 make swig-py swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
    148      swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</userinput></screen>
     143make</userinput></screen>
    149144
    150145    <para>
     
    156151      If you passed the <option>--enable-javahl</option> parameter to
    157152      <command>configure</command> and wish to build the Java bindings, issue
    158       the following command:
    159     </para>
    160 
    161 <screen><userinput>make javahl</userinput></screen>
    162 
    163 <!--    <para>
     153      the following command: <command>make javahl</command>
     154    </para>
     155
     156
     157    <para>
    164158      If you have a multi core CPU and normally run <command>make</command> with
    165159      multiple jobs (eg <command>make -j4</command>) then a bug in the
     
    167161      <application>Perl</application> bindings compiling correctly. Fix the
    168162      <filename>Makefile</filename> with this sed:
    169     </para>
    170 
    171 <screen><userinput>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in</userinput></screen>
    172 -->
    173     <para>
    174       To compile <application>Ruby</application>
    175       bindings, issue the following command:
    176     </para>
    177 <screen><userinput>make swig-rb</userinput></screen>
     163      <command>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in</command>
     164    </para>
     165
     166    <para>
     167      If you want to compile <application>Perl</application>,
     168      <application>Python2</application>, or <application>Ruby</application>
     169      bindings, issue any of the following command:
     170    </para>
     171    <para>
     172      <literallayout><command>make swig-pl</command> for <application>Perl</application>,
     173<command>make swig-py \
     174     swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
     175     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command> for <application>Python</application>,
     176<command>make swig-rb</command> for <application>Ruby</application>.
     177      </literallayout>
     178    </para>
    178179
    179180    <para>
     
    191192      To test the results of any of the <application>SWIG</application>
    192193      bindings, you can use any of the following commands:
    193     </para>
    194 
    195 <screen><userinput>make check-swig-pl &amp;&amp;
    196 make check-swig-py &amp;&amp;
    197 make check-swig-rb </userinput></screen>
     194      <command>make check-swig-pl</command>,
     195      <command> make check-swig-py</command>, or
     196      <command>make check-swig-rb</command>.
     197    </para>
     198
    198199
    199200    <para>
     
    202203
    203204<screen role="root"><userinput>make install &amp;&amp;
    204 make install-swig-pl &amp;&amp;
    205 make install-swig-py swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn    \
    206                      swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn &amp;&amp;
    207205install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
    208206cp      -v -R       doc/* \
     
    212210      If you built the Java bindings, issue the following command as the
    213211      <systemitem class="username">root</systemitem> user to install them:
    214     </para>
    215 
    216 <screen role="root"><userinput>make install-javahl</userinput></screen>
    217 
    218     <para>
    219       If you built the <application>SWIG</application>
    220       <application>Ruby</application> bindings, issue the following commands
    221       as the <systemitem class="username">root</systemitem> user to install
    222       them:
    223     </para>
    224 
    225 <screen role="root"><userinput>make install-swig-rb</userinput></screen>
     212      <command>make install-javahl</command>
     213    </para>
     214
     215
     216    <para>
     217      If you built the <application>Perl</application>,
     218      <application>Python2</application>, or
     219      <application>Ruby</application> bindings, issue any of the following
     220      commands as the <systemitem class="username">root</systemitem> user
     221      to install them:
     222    </para>
     223    <para>
     224      <literallayout><command>make install-swig-pl</command>
     225<command>make install-swig-py \
     226      swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
     227      swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command>
     228<command>make install-swig-rb</command></literallayout>
     229    </para>
    226230
    227231  </sect2>
     
    230234    <title>Command Explanations</title>
    231235
    232     <para>
    233       <command>sed -i 's#Makefile.PL.in$...</command>: Corrects a
    234        bug in the <filename>Makefile</filename>, which prevents using
    235        parallel jobs for Perl bindings.
    236     </para>
    237 
    238236    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    239237      href="../../xincludes/static-libraries.xml"/>
     
    241239    <para>
    242240      <parameter>--with-apache-libexecdir</parameter>:
    243       This switch sets <application>Apache HTTPD</application>
    244       module install dir.
    245     </para>
    246 
    247     <para>
    248       <command>make swig-&lt;language&gt;</command>: Builds &lt;language&gt;
    249       bindings.
    250     </para>
    251 
    252     <para>
    253       <command>make install-swig-&lt;language&gt;</command>: Installs
    254       &lt;language&gt; bindings.
     241      If <xref linkend="apache"/> is installed, the shared
     242      <application>Apache</application> modules are
     243      built. This switch allows to have those modules installed to
     244      <application>Apache</application>'s configured module dir instead
     245      of <filename class="directory">/usr/libexec</filename>. It has no effect
     246      if <application>Apache</application> is not installed.
    255247    </para>
    256248
     
    318310        <seg>
    319311          /usr/include/subversion-1,
    320           /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN,
    321           /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN,
    322           /usr/lib/python&python2-majorver;/site-packages/libsvn,
    323           /usr/lib/python&python2-majorver;/site-packages/svn,
     312          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN (optional),
     313          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN (optional),
     314          /usr/lib/python&python2-majorver;/site-packages/libsvn (optional),
     315          /usr/lib/python&python2-majorver;/site-packages/svn (optional),
    324316          /usr/lib/ruby/site_ruby/&lt;x.y&gt;/i686-linux/svn (optional),
    325317          /usr/lib/ruby/site_ruby/&lt;x.y&gt;/svn (optional),
Note: See TracChangeset for help on using the changeset viewer.