Attachment #533928 for bug #653878





  if [ python.configured ]
  {
    lib boost_mpi_python
    py3-version = [ py-version 3 ] ;

    # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
    lib_boost_python(2) = boost_python ;
    lib_boost_python(3) = boost_python3 ;

    lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
    lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;

    lib_boost_mpi_python(2) = boost_mpi_python ;
    lib_boost_mpi_python(3) = boost_mpi_python3 ;

    lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
    lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;

    for local N in 2 3
    {
        if $(py$(N)-version)
        {
            lib $(lib_boost_mpi_python($(py$(N)-version)))
              : # 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

                -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
                <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
                <python-debugging>on:<define>BOOST_DEBUG_PYTHON
                <python>$(py$(N)-version)
              : # Default build
                <link>shared
              : # Usage requirements
                <library>/mpi//mpi [ mpi.extra-requirements ]
              ;
            libraries += boost_mpi_python ;

            python-extension mpi
              : # Sources

                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_PYTHON_DYN_LINK=1
                <link>shared <runtime-link>shared
                <python-debugging>on:<define>BOOST_DEBUG_PYTHON
                <python>$(py$(N)-version)
              ;

            libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
        }
        else
        {
            alias $(lib_boost_mpi_python($(N))) ;
        }
    }
  }
}
else if ! ( --without-mpi in  [ modules.peek : ARGV ] )

Lines 36-44 local rule split-version ( version ) Link Here

(-)boost_1_67_0/libs/python/Jamfile (-3 / +4 lines)
36	# For example, Boost.Python built for Python 2.7 uses the suffix "27"	36	# For example, Boost.Python built for Python 2.7 uses the suffix "27"
37	rule version-suffix ( version )	37	rule version-suffix ( version )
38	{	38	{
39	local major-minor = [ split-version $(version) ] ;	39	# local major-minor = [ split-version $(version) ] ;
40	local suffix = $(major-minor:J="") ;	40	# local suffix = $(major-minor:J="") ;
41	return $(suffix) ;	41	# return $(suffix) ;
		42	return "" ;
42	}	43	}
43		44
44		45

Return to bug 653878

Lines 60-92 libraries += boost_mpi ; Link Here

(-)boost_1_67_0/libs/mpi/build/Jamfile.v2 (-34 / +5 lines)
60		60
61	if [ python.configured ]	61	if [ python.configured ]
62	{	62	{
63	py2-version = [ py-version 2 ] ;	63	lib boost_mpi_python
64	py3-version = [ py-version 3 ] ;
65
66	# These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
67	lib_boost_python(2) = boost_python ;
68	lib_boost_python(3) = boost_python3 ;
69
70	lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
71	lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
72
73	lib_boost_mpi_python(2) = boost_mpi_python ;
74	lib_boost_mpi_python(3) = boost_mpi_python3 ;
75
76	lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
77	lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
78
79	for local N in 2 3
80	{
81	if $(py$(N)-version)
82	{
83	lib $(lib_boost_mpi_python($(py$(N)-version)))
84	: # Sources	64	: # Sources
85	python/serialize.cpp	65	python/serialize.cpp
86	: # Requirements	66	: # Requirements
87	<library>boost_mpi	67	<library>boost_mpi
88	<library>/mpi//mpi [ mpi.extra-requirements ]	68	<library>/mpi//mpi [ mpi.extra-requirements ]
89	<library>/boost/python//$(lib_boost_python($(py$(N)-version)))	69	<library>/boost/python//boost_python
90	<link>shared:<define>BOOST_MPI_DYN_LINK=1	70	<link>shared:<define>BOOST_MPI_DYN_LINK=1
91	<link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1	71	<link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
92	<link>shared:<define>BOOST_PYTHON_DYN_LINK=1	72	<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
Lines 94-105 libraries += boost_mpi ; Link Here
94	-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag	74	-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
95	<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag	75	<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
96	<python-debugging>on:<define>BOOST_DEBUG_PYTHON	76	<python-debugging>on:<define>BOOST_DEBUG_PYTHON
97	<python>$(py$(N)-version)
98	: # Default build	77	: # Default build
99	<link>shared	78	<link>shared
100	: # Usage requirements	79	: # Usage requirements
101	<library>/mpi//mpi [ mpi.extra-requirements ]	80	<library>/mpi//mpi [ mpi.extra-requirements ]
102	;	81	;
		82	libraries += boost_mpi_python ;
103		83
104	python-extension mpi	84	python-extension mpi
105	: # Sources	85	: # Sources
Lines 116-123 libraries += boost_mpi ; Link Here
116	python/status.cpp	96	python/status.cpp
117	python/py_timer.cpp	97	python/py_timer.cpp
118	: # Requirements	98	: # Requirements
119	<library>/boost/python//$(lib_boost_python($(py$(N)-version)))	99	<library>/boost/python//boost_python
120	<library>$(lib_boost_mpi_python($(py$(N)-version)))	100	<library>boost_mpi_python
121	<library>boost_mpi	101	<library>boost_mpi
122	<library>/mpi//mpi [ mpi.extra-requirements ]	102	<library>/mpi//mpi [ mpi.extra-requirements ]
123	<link>shared:<define>BOOST_MPI_DYN_LINK=1	103	<link>shared:<define>BOOST_MPI_DYN_LINK=1
Lines 125-140 libraries += boost_mpi ; Link Here
125	<link>shared:<define>BOOST_PYTHON_DYN_LINK=1	105	<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
126	<link>shared <runtime-link>shared	106	<link>shared <runtime-link>shared
127	<python-debugging>on:<define>BOOST_DEBUG_PYTHON	107	<python-debugging>on:<define>BOOST_DEBUG_PYTHON
128	<python>$(py$(N)-version)
129	;	108	;
130
131	libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
132	}
133	else
134	{
135	alias $(lib_boost_mpi_python($(N))) ;
136	}
137	}
138	}	109	}
139	}	110	}
140	else if ! ( --without-mpi in [ modules.peek : ARGV ] )	111	else if ! ( --without-mpi in [ modules.peek : ARGV ] )