[pkg-boost-commits] r14363 - boost/trunk/debian/patches

[smr at alioth.debian.org]

Author: smr
Date: 2009-01-10 08:49:56 +0000 (Sat, 10 Jan 2009)
New Revision: 14363

Modified:
   boost/trunk/debian/patches/mpi-python.patch
Log:
Revise MPI python disable patch.

Modified: boost/trunk/debian/patches/mpi-python.patch
===================================================================
--- boost/trunk/debian/patches/mpi-python.patch	2009-01-10 06:54:00 UTC (rev 14362)
+++ boost/trunk/debian/patches/mpi-python.patch	2009-01-10 08:49:56 UTC (rev 14363)
@@ -1,11 +1,55 @@
 --- boost1.37-1.37.0.orig/libs/mpi/build/Jamfile.v2
 +++ boost1.37-1.37.0/libs/mpi/build/Jamfile.v2
-@@ -55,7 +55,7 @@
+@@ -55,52 +55,6 @@
    
  libraries += boost_mpi ;  
  
 -  if [ python.configured ]
-+  if [ python.configured ] && false
-   {
-     lib boost_mpi_python
-       : # Sources
+-  {
+-    lib boost_mpi_python
+-      : # Sources
+-        python/serialize.cpp
+-      : # Requirements
+-        <library>boost_mpi
+-        <library>/mpi//mpi [ mpi.extra-requirements ]
+-      	<library>/boost/python//boost_python
+-        <link>shared:<define>BOOST_MPI_DYN_LINK=1
+-        <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
+-        <link>shared:<define>BOOST_PYTHON_DYN_LINK=1        
+-        <define>BOOST_MPI_PYTHON_SOURCE=1
+-      : # Default build
+-        <link>shared
+-      : # Usage requirements
+-        <library>/mpi//mpi [ mpi.extra-requirements ]
+-      ;
+-    libraries += boost_mpi_python ;   
+-
+-    python-extension mpi 
+-      : # Sources
+-        python/collectives.cpp
+-        python/py_communicator.cpp
+-        python/datatypes.cpp
+-        python/documentation.cpp
+-        python/py_environment.cpp
+-        python/py_nonblocking.cpp
+-        python/py_exception.cpp
+-        python/module.cpp
+-        python/py_request.cpp
+-        python/skeleton_and_content.cpp
+-        python/status.cpp
+-        python/py_timer.cpp
+-      : # Requirements
+-      	<library>/boost/python//boost_python      
+-        <library>boost_mpi_python
+-        <library>boost_mpi
+-        <library>/mpi//mpi [ mpi.extra-requirements ]
+-        <link>shared:<define>BOOST_MPI_DYN_LINK=1    
+-        <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1        
+-        <link>shared:<define>BOOST_PYTHON_DYN_LINK=1    
+-        <link>shared 
+-        <variant>release   
+-      ;
+-  }
+ }
+ else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
+ {