Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-1690

Subversion bindings won't build w/SWIG 1.3.20

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • all
    • 1.0-consider
    • bindings_swig
    • None

    Description

      Simple patch to allow subversion to build against SWIG 1.3.20 or later (and a couple of bonus 
      README/INSTALL updates).
      
      Index: build/ac-macros/swig.m4
      ============================================================
      =======
      --- build/ac-macros/swig.m4	(revision 8177)
      +++ build/ac-macros/swig.m4	(working copy)
      @@ -1,9 +1,10 @@
       dnl check to see if SWIG is current enough.
       dnl
      -dnl if it is, then check to see if we have the correct version of python.
      +dnl if it is, then check to see which language are available and
      +dnl configured correctly.
       dnl
       dnl if we do, then set up the appropriate SWIG_ variables to build the 
      -dnl python bindings.
      +dnl various language bindings.
       
       AC_DEFUN(SVN_CHECK_SWIG,
       [
      @@ -71,14 +72,17 @@
       [
         where=$1
       
      +  AC_MSG_CHECKING([Looking for swig binary ($where)])
         if test $where = check; then
           AC_PATH_PROG(SWIG, swig, none)
      +    AC_MSG_RESULT([found ($SWIG)])
         else
           SWIG=$where/bin/swig
      +    AC_MSG_RESULT([$SWIG])
         fi
       
         if test "$SWIG" != "none"; then
      -    AC_MSG_CHECKING([swig version])
      +    AC_MSG_CHECKING([swig version ($SWIG)])
           SWIG_VERSION="`$SWIG -version 2>&1 | sed -ne 's/^.*Version \(.*\)$/\1/p'`"
           AC_MSG_RESULT([$SWIG_VERSION])
           # If you change the required swig version number, don't forget to update:
      @@ -88,12 +92,15 @@
           #   packages/rpm/redhat-7.x/subversion.spec
           #   packages/rpm/redhat-8.x/subversion.spec
           case $SWIG_VERSION in
      +	[1.3.2[0]*])
      +	  SWIG_SUITABLE=yes
      +	  ;;
               [1.3.1[679]*])
                 SWIG_SUITABLE=yes
                 ;;
               *)
                 SWIG_SUITABLE=no
      -          AC_MSG_WARN([swig bindings require 1.3.19.])
      +          AC_MSG_WARN([swig bindings require 1.3.19 or greater.])
                 ;;
           esac
           if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes" -a 
      "$svn_swig_bindings_enable_python" = "yes"; then
      Index: subversion/bindings/swig/INSTALL
      ============================================================
      =======
      --- subversion/bindings/swig/INSTALL	(revision 8177)
      +++ subversion/bindings/swig/INSTALL	(working copy)
      @@ -4,7 +4,7 @@
       
       
       Step 1:  Build & install the proper version of SWIG (which is
      -         currently swig 1.3.16).
      +         currently swig 1.3.20).
       
           * Go to http://www.swig.org/, download the sourceball, unpack.
       
      @@ -21,7 +21,7 @@
       
           * run 'make && make install'
       
      -    * To verify you have the goodz installed, check that these things
      +    * To verify you have the goods installed, check that these things
             were created, assuming your $PREFIX was /usr/local/lib:
       
                  - /usr/local/lib/swig1.3/*.i
      

      Original issue reported by bbum

      Attachments

        1. 1_SWIG.patch
          2 kB
          Subversion Importer
        2. 2_svn-swig-103020.patch
          10 kB
          Ben Reser
        3. 3_svn-swig-103020.patch
          13 kB
          Ben Reser
        4. 4_svn-SWIG-version-test.patch
          0.6 kB
          Ben Reser
        5. 5_svn-SWIG-version-test.patch
          1 kB
          Ben Reser
        6. 6_svn-swigpy-103020.patch
          1 kB
          Ben Reser

        Activity

          People

            Unassigned Unassigned
            subversion-importer Subversion Importer
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: