← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/python-multiarch-include.patch

  • 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:
debian/patches/python-multiarch-include.patch
 
1
Description: handle Python multiarch include locations correctly
 
2
Author: Robie Basak <robie.basak@canonical.com>
 
3
Bug: http://pysvn.tigris.org/issues/show_bug.cgi?id=184
 
4
Forwarded: http://pysvn.tigris.org/issues/show_bug.cgi?id=184
 
5
Last-Update: 2013-01-24
 
6
 
 
7
--- a/Source/setup_configure.py
 
8
+++ b/Source/setup_configure.py
 
9
@@ -1146,11 +1146,13 @@
 
10
 
 
11
         self._addVar( 'PYTHON_VERSION', '%d.%d' % (sys.version_info[0], sys.version_info[1]) )
 
12
         self._addVar( 'PYTHON_INC',     distutils.sysconfig.get_python_inc() )
 
13
+        self._addVar( 'PYTHON_ARCH_SPECIFIC_INC',     distutils.sysconfig.get_python_inc(True) )
 
14
 
 
15
         py_cflags_list = [
 
16
                     '-Wall -fPIC -fexceptions -frtti',
 
17
                     '-I. -I%(APR_INC)s -I%(SVN_INC)s',
 
18
                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
 
19
+                    '-I%(PYTHON_ARCH_SPECIFIC_INC)s',
 
20
                     '-D%(DEBUG)s',
 
21
                     ]
 
22
         for define, value in self.py_module_defines: