boost/python_library_name.patch

59 lines
2.0 KiB
Diff

Python module needs to be built without these extra renames.
MPI module needs to reference correct python
~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2
~===================================================================
~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2
~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2
~@@ -61,10 +61,10 @@ libraries += boost_mpi ;
~ lib boost_mpi_python
~ : # Sources
~ python/serialize.cpp
~+ /user-config//boost_python_alias
~ : # 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
~@@ -92,8 +92,8 @@ libraries += boost_mpi ;
~ python/skeleton_and_content.cpp
~ python/status.cpp
~ python/py_timer.cpp
~+ /user-config//boost_python_alias
~ : # Requirements
~- <library>/boost/python//boost_python
~ <library>boost_mpi_python
~ <library>boost_mpi
~ <library>/mpi//mpi [ mpi.extra-requirements ]
Index: boost_1_75_0/boostcpp.jam
===================================================================
--- boost_1_75_0.orig/boostcpp.jam
+++ boost_1_75_0/boostcpp.jam
@@ -227,15 +227,15 @@ rule python-tag ( name : type ? : proper
{
# Add Python version suffix
- local version = [ $(property-set).get <python> ] ;
-
- local major-minor = [ MATCH "^([0-9]+)\.([0-9]+)" : $(version) ] ;
- local suffix = $(major-minor:J="") ;
-
- if $(suffix)
- {
- result = $(result)$(suffix) ;
- }
+ # local version = [ $(property-set).get <python> ] ;
+ #
+ # local major-minor = [ MATCH "^([0-9]+)\.([0-9]+)" : $(version) ] ;
+ # local suffix = $(major-minor:J="") ;
+ #
+ # if $(suffix)
+ # {
+ # result = $(result)$(suffix) ;
+ # }
# Add PYTHON_ID if supplied