Merge lp:~vorlon/python/lp.738213 into lp:~doko/python/pkg2.7-debian

[Steve Langasek]

Matthias, please review this proposed fix to the python2.7 packaging's
detection of the multiarch path at build time, and if you find it suitable,
please upload.

[lp:~vorlon/python/lp.738213]

55. By Steve Langasek on 2011-03-23

releasing version 2.7.1-5ubuntu1

Unmerged revisions

55. By Steve Langasek on 2011-03-23

releasing version 2.7.1-5ubuntu1

54. By Steve Langasek on 2011-03-23

debian/patches/deb-setup.diff: DEB_GNU_TYPE was never being set, so
the expected multiarch path support wasn't working. Consolidate to
a single call to dpkg-architecture -qDEB_HOST_MULTIARCH in setup.py.
LP: #738213.

=== modified file 'changelog'
--- changelog	2011-02-24 06:44:54 +0000
+++ changelog	2011-03-23 22:05:59 +0000
@@ -1,3 +1,12 @@
+python2.7 (2.7.1-5ubuntu1) natty; urgency=low
+
+  * debian/patches/deb-setup.diff: DEB_GNU_TYPE was never being set, so
+    the expected multiarch path support wasn't working.  Consolidate to
+    a single call to dpkg-architecture -qDEB_HOST_MULTIARCH in setup.py.
+    LP: #738213.
+
+ -- Steve Langasek <[e-mail]>  Wed, 23 Mar 2011 15:02:47 -0700
+
 python2.7 (2.7.1-5) experimental; urgency=low
 
   * Update to 20110224, taken from the 2.7 branch.

=== modified file 'patches/deb-setup.diff'
--- patches/deb-setup.diff	2010-11-14 02:51:54 +0000
+++ patches/deb-setup.diff	2011-03-23 22:05:59 +0000
@@ -1,18 +1,10 @@
 # DP: Don't include /usr/local/include and /usr/local/lib as gcc search paths
 # DP: Include /usr/include/<triplet> and /usr/lib/<triplet> as gcc search paths
 
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -207,6 +207,7 @@
- 
- 
- LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
-+DEB_GNU_TYPE=@DEB_GNU_TYPE@
- 
- ##########################################################################
- # Parser
---- a/setup.py
-+++ b/setup.py
+Index: python2.7-2.7.1/setup.py
+===================================================================
+--- python2.7-2.7.1.orig/setup.py
++++ python2.7-2.7.1/setup.py
 @@ -347,8 +347,12 @@
  
      def detect_modules(self):
@@ -22,18 +14,9 @@
 +        # On Debian /usr/local is always used, so we don't include it twice
 +        #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 +        #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+        triplet = sysconfig.get_config_var("DEB_GNU_TYPE")
++        triplet = os.popen('dpkg-architecture -qDEB_HOST_MULTIARCH').readline()[:-1]
 +        add_dir_to_list(self.compiler.library_dirs, '/usr/lib/%s' % triplet)
 +        add_dir_to_list(self.compiler.include_dirs, '/usr/include/%s' % triplet)
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -408,6 +412,8 @@
-             '/lib', '/usr/lib',
-             ]
-         inc_dirs = self.compiler.include_dirs + ['/usr/include']
-+        gnu_triplet = os.popen('dpkg-architecture -qDEB_HOST_GNU_TYPE').readline()[:-1]
-+        inc_dirs.append(os.path.join('/usr/include', gnu_triplet))
-         exts = []
-         missing = []
-