95 lines
3.2 KiB
Diff
95 lines
3.2 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_64_0/libs/python/build/Jamfile
|
||
|
|
===================================================================
|
||
|
|
--- boost_1_64_0.orig/libs/python/build/Jamfile
|
||
|
|
+++ boost_1_64_0/libs/python/build/Jamfile
|
||
|
|
@@ -42,15 +42,15 @@ rule cond ( test ? : yes * : no * ) { if
|
||
|
|
rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
|
||
|
|
local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } }
|
||
|
|
|
||
|
|
-lib_boost_python(2) = boost_python ;
|
||
|
|
-lib_boost_python(3) = boost_python3 ;
|
||
|
|
+#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_python($(py2-version)) = $(lib_boost_python(2)) ;
|
||
|
|
+#lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
|
||
|
|
|
||
|
|
rule lib_boost_python ( version )
|
||
|
|
{
|
||
|
|
- lib $(lib_boost_python($(version)))
|
||
|
|
+ lib boost_python #$(lib_boost_python($(version)))
|
||
|
|
: # sources
|
||
|
|
numeric.cpp
|
||
|
|
list.cpp
|
||
|
|
@@ -122,16 +122,16 @@ rule lib_boost_python ( version )
|
||
|
|
;
|
||
|
|
}
|
||
|
|
|
||
|
|
-lib_boost_numpy(2) = boost_numpy ;
|
||
|
|
-lib_boost_numpy(3) = boost_numpy3 ;
|
||
|
|
+#lib_boost_numpy(2) = boost_numpy ;
|
||
|
|
+#lib_boost_numpy(3) = boost_numpy3 ;
|
||
|
|
|
||
|
|
-lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
|
||
|
|
-lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
|
||
|
|
+#lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
|
||
|
|
+#lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
|
||
|
|
|
||
|
|
rule lib_boost_numpy ( version )
|
||
|
|
{
|
||
|
|
numpy-include = [ python.numpy-include ] ;
|
||
|
|
- lib $(lib_boost_numpy($(version)))
|
||
|
|
+ lib boost_numpy #$(lib_boost_numpy($(version)))
|
||
|
|
: # sources
|
||
|
|
numpy/dtype.cpp
|
||
|
|
numpy/matrix.cpp
|
||
|
|
@@ -173,7 +173,7 @@ for local N in 2 3
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- alias $(lib_boost_python($(N))) ;
|
||
|
|
+ #alias $(lib_boost_python($(N))) ;
|
||
|
|
}
|
||
|
|
if $(py$(N)-version) && [ python.numpy ]
|
||
|
|
{
|
||
|
|
@@ -182,7 +182,7 @@ for local N in 2 3
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- alias $(lib_boost_numpy($(N))) ;
|
||
|
|
+ #alias $(lib_boost_numpy($(N))) ;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|