Dirk Mueller
62336d0b67
* adds Boost.NoWide * see https://www.boost.org/users/history/version_1_72_0.html * see https://www.boost.org/users/history/version_1_73_0.html * see https://www.boost.org/users/history/version_1_74_0.html - remove riscv-support.patch, 3ecbf83f.patch (upstream) - remove boost-visibility.patch, boost-no_segfault_in_Regex_filter.patch (obsolete, will never go upstream) - add boost-remove-cmakedir.patch (remove buildroot embedding in cmake files) OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=253
60 lines
2.3 KiB
Diff
60 lines
2.3 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_74_0/libs/python/Jamfile
|
|
===================================================================
|
|
--- boost_1_74_0.orig/libs/python/Jamfile
|
|
+++ boost_1_74_0/libs/python/Jamfile
|
|
@@ -36,9 +36,10 @@ local rule split-version ( version )
|
|
# For example, Boost.Python built for Python 2.7 uses the suffix "27"
|
|
rule version-suffix ( version )
|
|
{
|
|
- local major-minor = [ split-version $(version) ] ;
|
|
- local suffix = $(major-minor:J="") ;
|
|
- return $(suffix) ;
|
|
+ # local major-minor = [ split-version $(version) ] ;
|
|
+ # local suffix = $(major-minor:J="") ;
|
|
+ # return $(suffix) ;
|
|
+ return "" ;
|
|
}
|
|
|
|
|
|
Index: boost_1_74_0/tools/build/src/tools/python.jam
|
|
===================================================================
|
|
--- boost_1_74_0.orig/tools/build/src/tools/python.jam
|
|
+++ boost_1_74_0/tools/build/src/tools/python.jam
|
|
@@ -664,6 +664,7 @@ local rule system-library-dependencies (
|
|
# For example, Boost.Python built for Python 2.7 uses the suffix "27"
|
|
rule version-suffix ( version )
|
|
{
|
|
+ return "" ;
|
|
local major-minor = [ split-version $(version) ] ;
|
|
local suffix = $(major-minor:J="") ;
|
|
return $(suffix) ;
|