← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pysvn/trusty

« back to all changes in this revision

Viewing changes to Source/setup_configure.py

  • Committer: Package Import Robot
  • Author(s): Robie Basak
  • Date: 2013-01-24 13:58:38 UTC
  • mfrom: (15.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20130124135838-a3vlzpgvdfdpzq85
Tags: 1.7.6-0.3ubuntu1
https://launchpad.net/bugs/1104078
https://launchpad.net/bugs/1045021
* Merge from Debian unstable (LP: #1104078).  Remaining changes:
  - debian/patches/02-fix-ld-shared.patch:
    + Fix linking with -lsvn* (LP: #1045021)
* debian/patches/python-multiarch-include.patch: fix include paths for new
  multiarch include locations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/setup_configure.py
200
200
            self.c_utils = LinuxCompilerGCC( self )
201
201
            self.c_pysvn = LinuxCompilerGCC( self )
202
202
 
 
203
        elif self.platform == 'kfreebsd':
 
204
            self.c_utils = LinuxCompilerGCC( self )
 
205
            self.c_pysvn = LinuxCompilerGCC( self )
 
206
 
 
207
        elif self.platform == 'hurd':
 
208
            self.c_utils = LinuxCompilerGCC( self )
 
209
            self.c_pysvn = LinuxCompilerGCC( self )
 
210
 
203
211
        elif self.platform == 'freebsd':
204
212
            self.c_utils = FreeBsdCompilerGCC( self )
205
213
            self.c_pysvn = FreeBsdCompilerGCC( self )
1138
1146
 
1139
1147
        self._addVar( 'PYTHON_VERSION', '%d.%d' % (sys.version_info[0], sys.version_info[1]) )
1140
1148
        self._addVar( 'PYTHON_INC',     distutils.sysconfig.get_python_inc() )
 
1149
        self._addVar( 'PYTHON_ARCH_SPECIFIC_INC',     distutils.sysconfig.get_python_inc(True) )
1141
1150
 
1142
1151
        py_cflags_list = [
1143
1152
                    '-Wall -fPIC -fexceptions -frtti',
1144
1153
                    '-I. -I%(APR_INC)s -I%(SVN_INC)s',
1145
1154
                    '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
 
1155
                    '-I%(PYTHON_ARCH_SPECIFIC_INC)s',
1146
1156
                    '-D%(DEBUG)s',
1147
1157
                    ]
1148
1158
        for define, value in self.py_module_defines: