[pkg-boost-commits] r14753 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2013-03-20 06:45:50 +0000 (Wed, 20 Mar 2013)
New Revision: 14753

Added:
   boost/trunk/debian/patches/fix-ftbfs-python-3.3.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Enable building with python3.3 & multiarch.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2013-03-20 06:24:33 UTC (rev 14752)
+++ boost/trunk/debian/changelog	2013-03-20 06:45:50 UTC (rev 14753)
@@ -5,8 +5,11 @@
 
   * rules: context is not supported for ia64, s390, s390x, and sparc.
   
- -- Steve M. Robbins <smr at debian.org>  Wed, 20 Mar 2013 01:24:20 -0500
+  * patches/fix-ftbfs-python-3.3.patch: New.  Allow building with
+    multiarch python3.3 (thanks, Dmitrijs Ledkovs).  Closes: #691378.
 
+ -- Steve M. Robbins <smr at debian.org>  Wed, 20 Mar 2013 01:45:32 -0500
+
 boost1.53 (1.53.0-1) unstable; urgency=low
 
   * New upstream.  Update versions in control, rules.  Update file lists

Added: boost/trunk/debian/patches/fix-ftbfs-python-3.3.patch
===================================================================
--- boost/trunk/debian/patches/fix-ftbfs-python-3.3.patch	                        (rev 0)
+++ boost/trunk/debian/patches/fix-ftbfs-python-3.3.patch	2013-03-20 06:45:50 UTC (rev 14753)
@@ -0,0 +1,20 @@
+Description: python3.3 has an extra multiarch include location
+Author: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
+Last-Update: 2012-10-26
+Forwarded: no
+
+Index: b/tools/build/v2/tools/python.jam
+===================================================================
+--- a/tools/build/v2/tools/python.jam
++++ b/tools/build/v2/tools/python.jam
+@@ -548,7 +548,9 @@
+     }
+     else
+     {
+-        includes ?= $(prefix)/include/python$(version) ;
++        python_includes = [ shell-cmd "printf `python$(version) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());'`" ] ;
++        python_platincludes = [ shell-cmd "printf `python$(version) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc(plat_specific=1));'`" ] ;
++        includes ?= $(python_includes) $(python_platincludes) ;
+ 
+         local lib = $(exec-prefix)/lib ;
+         libraries ?= $(lib)/python$(version)/config $(lib) ;

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2013-03-20 06:24:33 UTC (rev 14752)
+++ boost/trunk/debian/patches/series	2013-03-20 06:45:50 UTC (rev 14753)
@@ -3,3 +3,4 @@
 boost-1.44-py3.1.patch
 pythonid.patch
 mpi-allocator-c++0x.patch
+fix-ftbfs-python-3.3.patch