[Python-modules-commits] [pysvn] 03/07: avoid FTBFS with Subversion1.7

[Josué Ortega]

This is an automated email from the git hooks/post-receive script.

noahfx-guest pushed a commit to branch master
in repository pysvn.

commit eb782927a723ac46264cbc2464cfc6ee0031412b
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sun Oct 11 21:16:57 2015 +0200

    avoid FTBFS with Subversion1.7
    
     Just converted old patch to pysvn 1.7.6 release...
    
    Author: Hideki Yamane <henrich at debian.org>
    
    Patch-Name: 01-setup_configure.patch
---
 Source/setup_configure.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/setup_configure.py b/Source/setup_configure.py
index afeee2d..65fd457 100644
--- a/Source/setup_configure.py
+++ b/Source/setup_configure.py
@@ -470,11 +470,11 @@ class Compiler:
                     '--pycxx-dir',
                     None,
                     self._find_paths_pycxx_dir,
-                    'CXX/Version.hxx' )
+                    'cxxsupport.cxx' )
 
         major_match = False
         minor_match = False
-        f = open( os.path.join( pycxx_dir, 'CXX/Version.hxx' ) )
+        f = open( os.path.join( '/usr/include/python%s' % sys.version[:3], 'CXX/Version.hxx' ) )
         for line in f:
             words = line.split()
             if 'PYCXX_VERSION_MAJOR' in words:
@@ -485,6 +485,7 @@ class Compiler:
         if not major_match and not minor_match:
             raise SetupError( 'PyCXX version not as required.' )
 
+        return '/usr/share/python%s' % sys.version[:3]
         return pycxx_dir
 
     def find_pycxx_src( self ):
@@ -549,7 +550,8 @@ class Compiler:
 
     def find_apr_lib( self ):
         last_exception = None
-        lib_list = [(self.get_lib_name_for_platform( 'libapr-1' ), 'apr-1'),
+        lib_list = [(self.get_lib_name_for_platform( 'libapr-1.0' ), 'apr-1.0'),
+                    (self.get_lib_name_for_platform( 'libapr-1' ), 'apr-1'),
                     (self.get_lib_name_for_platform( 'libapr-0' ), 'apr-0')]
 
         for apr_libname, self.lib_apr in lib_list:
@@ -1240,7 +1242,7 @@ class CygwinCompilerGCC(UnixCompilerGCC):
                 '-L/usr/lib/python%d.%d/config -lpython%d.%d.dll' %
                     (sys.version_info[0], sys.version_info[1], sys.version_info[0], sys.version_info[1]),
                 '-lsvn_client-1',
-                '-lsvn_repos-1',
+                '-lsvn_repos-1 `apr-config --link-ld --libs`',
                 '-lsvn_subr-1',
                 '-lsvn_delta-1',
                 '-lsvn_fs_fs-1',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pysvn.git