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

[Steven Michael Robbins]

Author: smr
Date: 2011-11-27 19:49:48 +0000 (Sun, 27 Nov 2011)
New Revision: 14671

Added:
   boost/trunk/debian/patches/pythonid.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Fix jam option --python-buildid.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-11-26 05:13:31 UTC (rev 14670)
+++ boost/trunk/debian/changelog	2011-11-27 19:49:48 UTC (rev 14671)
@@ -12,7 +12,9 @@
   * patches/hurd-execution_monitor.patch: Remove.  Pino Toscano advised
     that the hurd no longer needs these.
 
- -- Steve M. Robbins <smr at debian.org>  Fri, 25 Nov 2011 22:43:07 -0600
+  * patches/pythonid.patch: New.  Fix jam option --python-buildid.
+  
+ -- Steve M. Robbins <smr at debian.org>  Sun, 27 Nov 2011 13:49:27 -0600
 
 boost1.46 (1.46.1-7) unstable; urgency=low
 

Added: boost/trunk/debian/patches/pythonid.patch
===================================================================
--- boost/trunk/debian/patches/pythonid.patch	                        (rev 0)
+++ boost/trunk/debian/patches/pythonid.patch	2011-11-27 19:49:48 UTC (rev 14671)
@@ -0,0 +1,67 @@
+--- boost1.48-1.48.0.orig/boostcpp.jam
++++ boost1.48-1.48.0/boostcpp.jam
+@@ -99,13 +99,6 @@
+     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" "_" ] ;
+ }
+ 
+-# Python build id (only for Python libraries)
+-python-id = [ option.get "python-buildid" ] ;
+-if $(python-id)
+-{
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
+-}
+-
+ ##############################################################################
+ #
+ # 1. The 'tag' function that adds decoration suitable to the properties if
+--- boost1.48-1.48.0.orig/libs/mpi/build/Jamfile.v2
++++ boost1.48-1.48.0/libs/mpi/build/Jamfile.v2
+@@ -8,6 +8,8 @@
+ #  Authors: Douglas Gregor
+ #           Andrew Lumsdaine
+ 
++import option ;
++import regex ;
+ import mpi ;
+ import indirect ;
+ import python ;
+@@ -24,6 +26,13 @@
+     <tag>@$(__name__).tag
+   ;
+ 
++# Python build id (only for Python libraries)
++python-id = [ option.get "python-buildid" ] ;
++if $(python-id)
++{
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
++}
++
+ rule tag ( name : type ? : property-set )
+ {
+     local result = $(name) ;
+--- boost1.48-1.48.0.orig/libs/python/build/Jamfile.v2
++++ boost1.48-1.48.0/libs/python/build/Jamfile.v2
+@@ -2,6 +2,8 @@
+ # Software License, Version 1.0. (See accompanying
+ # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ 
++import option ;
++import regex ;
+ import os ;
+ import indirect ;
+ import modules ;
+@@ -30,6 +32,14 @@
+         ;
+ }
+ 
++# Python build id (only for Python libraries)
++python-id = [ option.get "python-buildid" ] ;
++if $(python-id)
++{
++    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
++}
++
++
+ rule find-py3-version
+ {
+     local versions = [ feature.values python ] ;

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2011-11-26 05:13:31 UTC (rev 14670)
+++ boost/trunk/debian/patches/series	2011-11-27 19:49:48 UTC (rev 14671)
@@ -3,3 +3,4 @@
 sh4.patch
 kfreebsd-thread.patch
 boost-1.44-py3.1.patch
+pythonid.patch