blob: 8fb164a6278b299424e09b99cbf9025b67d6c8b1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
Tag Boost.MPI python impls properly to avoid name clash
https://github.com/boostorg/mpi/issues/112
--- a/boostcpp.jam
+++ b/boostcpp.jam
@@ -185,7 +185,7 @@
rule tag ( name : type ? : property-set )
{
- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
{
local args = $(.format-name-args) ;
if $(layout) = versioned
@@ -223,7 +223,7 @@
{
local result = $(name) ;
- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
{
# Add Python version suffix
--- a/libs/mpi/build/Jamfile.v2
+++ b/libs/mpi/build/Jamfile.v2
@@ -58,13 +58,13 @@
rule python-tag ( name : type ? : property-set )
{
local result = $(name) ;
- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
{
local version = [ $(property-set).get <python> ] ;
local lib-suffix = [ version-suffix $(version) ] ;
result = $(result)$(lib-suffix) ;
}
- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION && $(PYTHON_ID)
{
result = $(result)-$(PYTHON_ID) ;
}
@@ -168,6 +168,8 @@
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
<link>shared <runtime-link>shared
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
+ -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
+ <tag>@$(__name__).python-tag
;
mpi_python_libs = boost_mpi_python mpi ;
|
GitWeb
