From aac9ce8238a484b15025fa44ecb9d505d792813f014287f513b267b263681f5b Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 10 Sep 2019 16:19:29 +0000 Subject: [PATCH] Accepting request 729933 from home:adamm:boost_test - Update to version 1.71.0 Breaking changes: * Uuid: MD5 name-based uuid generation was corrected to be identical on all endian systems. Define BOOST_UUID_COMPAT_PRE_1_71_MD5 to keep the result in a format compatible with 1.66 through 1.70. This does not affect the default name-based uuid generation which is based on SHA1 * Test: Boost.Test shows deprecation warnings if some very old headers as deprecated. If you encounter such warnings, please follow the indications: those headers will be removed in a future release. New libraries: * Variant2: A never-valueless, strong guarantee implementation of std::variant Updated libraries: * align, asio, any, beast, circular buffer, container, context, conversion, core, dynamic bitset, endian, fiber, filesystem, flyweight, histogram, iostreams, interprocess, intrusive, legical cast, log, math, metaparse, move, multi array, multi-index containers, outcome, parameter, ptrcontainer, polycollection, smartptr, stacktrace, test, utility, uuid, variant, yap For detailed changes see https://www.boost.org/users/history/version_1_71_0.html - drop upstream patches no longer needed: boost-1.57.0-python-libpython_dep.patch, 0001-beast-fix-moved-from-executor.patch, remove_boost_serialization_depends, cmake.patch - updated patches: boost-1.57.0-python-abi_letters.patch, 3ecbf83f.patch OBS-URL: https://build.opensuse.org/request/show/729933 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=232 --- 0001-beast-fix-moved-from-executor.patch | 89 ------- 3ecbf83f.patch | 35 +++ baselibs.conf | 50 ++-- boost-1.57.0-python-abi_letters.patch | 32 ++- boost-1.57.0-python-libpython_dep.patch | 13 -- boost.changes | 54 +++++ boost.spec | 285 ++++++++++++----------- boost_1_70_0.tar.bz2 | 3 - boost_1_71_0.tar.bz2 | 3 + remove_boost_serialization_depends.patch | 35 +++ 10 files changed, 321 insertions(+), 278 deletions(-) delete mode 100644 0001-beast-fix-moved-from-executor.patch create mode 100644 3ecbf83f.patch delete mode 100644 boost-1.57.0-python-libpython_dep.patch delete mode 100644 boost_1_70_0.tar.bz2 create mode 100644 boost_1_71_0.tar.bz2 create mode 100644 remove_boost_serialization_depends.patch diff --git a/0001-beast-fix-moved-from-executor.patch b/0001-beast-fix-moved-from-executor.patch deleted file mode 100644 index 4c5f9df..0000000 --- a/0001-beast-fix-moved-from-executor.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur a/boost/beast/websocket/impl/ping.hpp b/boost/beast/websocket/impl/ping.hpp ---- a/boost/beast/websocket/impl/ping.hpp 2019-05-06 22:01:43.435117251 -0400 -+++ b/boost/beast/websocket/impl/ping.hpp 2019-05-06 22:02:37.949433556 -0400 -@@ -176,7 +176,8 @@ - impl.op_idle_ping.emplace(std::move(*this)); - impl.wr_block.lock(this); - BOOST_ASIO_CORO_YIELD -- net::post(this->get(), std::move(*this)); -+ net::post( -+ this->get_executor(), std::move(*this)); - BOOST_ASSERT(impl.wr_block.is_locked(this)); - } - if(impl.check_stop_now(ec)) -diff -Naur a/libs/beast/CHANGELOG.md b/libs/beast/CHANGELOG.md ---- a/libs/beast/CHANGELOG.md 2019-05-06 22:02:54.332528615 -0400 -+++ b/libs/beast/CHANGELOG.md 2019-05-06 22:03:05.896595711 -0400 -@@ -1,3 +1,10 @@ -+Version 248-hf1: -+ -+* Add idle ping suspend test -+* Fix moved-from executor in idle ping timeout -+ -+-------------------------------------------------------------------------------- -+ - Version 248: - - * Don't use a moved-from handler -diff -Naur a/libs/beast/test/beast/websocket/ping.cpp b/libs/beast/test/beast/websocket/ping.cpp ---- a/libs/beast/test/beast/websocket/ping.cpp 2019-05-06 22:02:54.342528673 -0400 -+++ b/libs/beast/test/beast/websocket/ping.cpp 2019-05-06 22:03:05.908595781 -0400 -@@ -10,8 +10,11 @@ - // Test that header file is self-contained. - #include - -+#include -+ - #include "test.hpp" - -+#include - #include - #include - -@@ -366,6 +369,46 @@ - BEAST_EXPECT(count == 3); - }); - -+ // suspend idle ping -+ { -+ using socket_type = -+ net::basic_stream_socket< -+ net::ip::tcp, -+ net::executor>; -+ net::io_context ioc; -+ stream ws1(ioc); -+ stream ws2(ioc); -+ ws1.set_option(stream_base::timeout{ -+ stream_base::none(), -+ std::chrono::seconds(0), -+ true}); -+ test::connect( -+ ws1.next_layer(), -+ ws2.next_layer()); -+ ws1.async_handshake("localhost", "/", -+ [](error_code){}); -+ ws2.async_accept([](error_code){}); -+ ioc.run(); -+ ioc.restart(); -+ flat_buffer b1; -+ auto mb = b1.prepare(65536); -+ std::memset(mb.data(), 0, mb.size()); -+ b1.commit(65536); -+ ws1.async_write(b1.data(), -+ [&](error_code, std::size_t){}); -+ BEAST_EXPECT( -+ ws1.impl_->wr_block.is_locked()); -+ ws1.async_read_some(net::mutable_buffer{}, -+ [&](error_code, std::size_t){}); -+ ioc.run(); -+ ioc.restart(); -+ flat_buffer b2; -+ ws2.async_read(b2, -+ [&](error_code, std::size_t){}); -+ ioc.run(); -+ } -+ //); -+ - { - echo_server es{log, kind::async}; - net::io_context ioc; diff --git a/3ecbf83f.patch b/3ecbf83f.patch new file mode 100644 index 0000000..1103905 --- /dev/null +++ b/3ecbf83f.patch @@ -0,0 +1,35 @@ +commit 3ecbf83ff33750ceffda199de97283d200357633 +Author: Andrey Semashev +Date: Sat Apr 13 21:54:45 2019 +0300 + + Added MPI Python libs to install target. + + This fixes mpi plugins for Python not being built and installed. + +Index: boost_1_71_0/libs/mpi/build/Jamfile.v2 +=================================================================== +--- boost_1_71_0.orig/libs/mpi/build/Jamfile.v2 ++++ boost_1_71_0/libs/mpi/build/Jamfile.v2 +@@ -74,6 +74,7 @@ rule python-tag ( name : type ? : proper + return [ tag $(result) : $(type) : $(property-set) ] ; + } + ++mpi_python_libs = ; + + if [ mpi.configured ] + { +@@ -169,6 +170,8 @@ lib boost_mpi + shared shared + on:BOOST_DEBUG_PYTHON + ; ++ ++ mpi_python_libs = boost_mpi_python mpi ; + } + } + else if ! ( --without-mpi in [ modules.peek : ARGV ] ) +@@ -185,4 +188,4 @@ else + alias boost_mpi ; + } + +-boost-install boost_mpi ; ++boost-install boost_mpi $(mpi_python_libs) ; diff --git a/baselibs.conf b/baselibs.conf index cae0e0b..16307b0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,25 +1,25 @@ -libboost_atomic1_70_0 -libboost_container1_70_0 -libboost_context1_70_0 -libboost_coroutine1_70_0 -libboost_date_time1_70_0 -libboost_fiber1_70_0 -libboost_filesystem1_70_0 -libboost_graph1_70_0 -libboost_graph_parallel1_70_0 -libboost_iostreams1_70_0 -libboost_locale1_70_0 -libboost_math1_70_0 -libboost_mpi1_70_0 -libboost_test1_70_0 -libboost_program_options1_70_0 -libboost_python-py2_7-1_70_0 -libboost_python-py3-1_70_0 -libboost_random1_70_0 -libboost_serialization1_70_0 -libboost_stacktrace1_70_0 -libboost_system1_70_0 -libboost_thread1_70_0 -libboost_type_erasure1_70_0 -libboost_wave1_70_0 -libboost_regex1_70_0 +libboost_atomic1_71_0 +libboost_container1_71_0 +libboost_context1_71_0 +libboost_coroutine1_71_0 +libboost_date_time1_71_0 +libboost_fiber1_71_0 +libboost_filesystem1_71_0 +libboost_graph1_71_0 +libboost_graph_parallel1_71_0 +libboost_iostreams1_71_0 +libboost_locale1_71_0 +libboost_math1_71_0 +libboost_mpi1_71_0 +libboost_test1_71_0 +libboost_program_options1_71_0 +libboost_python-py2_7-1_71_0 +libboost_python-py3-1_71_0 +libboost_random1_71_0 +libboost_serialization1_71_0 +libboost_stacktrace1_71_0 +libboost_system1_71_0 +libboost_thread1_71_0 +libboost_type_erasure1_71_0 +libboost_wave1_71_0 +libboost_regex1_71_0 diff --git a/boost-1.57.0-python-abi_letters.patch b/boost-1.57.0-python-abi_letters.patch index 6460af5..0956e9e 100644 --- a/boost-1.57.0-python-abi_letters.patch +++ b/boost-1.57.0-python-abi_letters.patch @@ -1,7 +1,7 @@ -Index: boost_1_65_0/tools/build/src/tools/python.jam +Index: boost_1_71_0/tools/build/src/tools/python.jam =================================================================== ---- boost_1_65_0.orig/tools/build/src/tools/python.jam -+++ boost_1_65_0/tools/build/src/tools/python.jam +--- boost_1_71_0.orig/tools/build/src/tools/python.jam ++++ boost_1_71_0/tools/build/src/tools/python.jam @@ -99,7 +99,7 @@ py3-version = ; # using python : 2.3 : /usr/local/bin/python ; # @@ -20,7 +20,16 @@ Index: boost_1_65_0/tools/build/src/tools/python.jam project.pop-current ; } -@@ -659,7 +659,7 @@ local rule system-library-dependencies ( +@@ -507,7 +507,7 @@ local rule probe ( python-cmd ) + # have a value based on the information given. + # + local rule compute-default-paths ( target-os : version ? : prefix ? : +- exec-prefix ? ) ++ exec-prefix ? : abi-letters ? ) + { + exec-prefix ?= $(prefix) ; + +@@ -668,7 +668,7 @@ rule version-suffix ( version ) # Declare a target to represent Python's library. # @@ -29,7 +38,7 @@ Index: boost_1_65_0/tools/build/src/tools/python.jam { # Compute the representation of Python version in the name of Python's # library file. -@@ -683,13 +683,13 @@ local rule declare-libpython-target ( ve +@@ -692,13 +692,13 @@ local rule declare-libpython-target ( ve } # Declare it. @@ -45,7 +54,7 @@ Index: boost_1_65_0/tools/build/src/tools/python.jam { local prefix ; local exec-prefix ; -@@ -705,6 +705,7 @@ local rule configure ( version ? : cmd-o +@@ -714,6 +714,7 @@ local rule configure ( version ? : cmd-o extension-suffix ?= _d ; } extension-suffix ?= "" ; @@ -53,7 +62,16 @@ Index: boost_1_65_0/tools/build/src/tools/python.jam local cmds-to-try ; -@@ -968,7 +969,7 @@ local rule configure ( version ? : cmd-o +@@ -789,7 +790,7 @@ local rule configure ( version ? : cmd-o + exec-prefix = $(sys.exec_prefix) ; + + compute-default-paths $(target-os) : $(sys.version) : +- $(sys.prefix) : $(sys.exec_prefix) ; ++ $(sys.prefix) : $(sys.exec_prefix) : $(sys.abi_letters) ; + + version = $(sys.version) ; + interpreter-cmd ?= $(cmd) ; +@@ -970,7 +971,7 @@ local rule configure ( version ? : cmd-o } else { diff --git a/boost-1.57.0-python-libpython_dep.patch b/boost-1.57.0-python-libpython_dep.patch deleted file mode 100644 index bd14b54..0000000 --- a/boost-1.57.0-python-libpython_dep.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: boost_1_57_0/tools/build/src/tools/python.jam -=================================================================== ---- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) -+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) -@@ -994,7 +994,7 @@ - else - { - alias python_for_extensions -- : -+ : python - : $(target-requirements) - : - : $(usage-requirements) diff --git a/boost.changes b/boost.changes index ce39ea8..9a804c1 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Tue Sep 10 16:01:35 UTC 2019 - Adam Majer + +- Update to version 1.71.0 + Breaking changes: + * Uuid: MD5 name-based uuid generation was corrected to be identical + on all endian systems. Define BOOST_UUID_COMPAT_PRE_1_71_MD5 to + keep the result in a format compatible with 1.66 through 1.70. + This does not affect the default name-based uuid generation + which is based on SHA1 + + * Test: Boost.Test shows deprecation warnings if some very old + headers as deprecated. If you encounter such warnings, please + follow the indications: those headers will be removed in a future + release. + + New libraries: + * Variant2: A never-valueless, strong guarantee implementation + of std::variant + + Updated libraries: + * align, asio, any, beast, circular buffer, container, context, + conversion, core, dynamic bitset, endian, fiber, filesystem, + flyweight, histogram, iostreams, interprocess, intrusive, + legical cast, log, math, metaparse, move, multi array, + multi-index containers, outcome, parameter, ptrcontainer, + polycollection, smartptr, stacktrace, test, utility, uuid, + variant, yap + + For detailed changes see + https://www.boost.org/users/history/version_1_71_0.html + +- drop upstream patches no longer needed: + boost-1.57.0-python-libpython_dep.patch, + 0001-beast-fix-moved-from-executor.patch, + remove_boost_serialization_depends, cmake.patch + +- updated patches: boost-1.57.0-python-abi_letters.patch, + 3ecbf83f.patch + +------------------------------------------------------------------- +Tue May 28 13:22:30 UTC 2019 - Adam Majer + +- 3ecbf83f.patch: add upstream patch to build and install python-mpi + extention. +- remove_boost_serialization_depends.patch: workaround to build + python mpi extention + +------------------------------------------------------------------- +Mon May 13 13:25:24 UTC 2019 - Adam Majer + +- cmake.patch: add upstream patches making it more compatible with + cmake's FindBoost + ------------------------------------------------------------------- Fri Apr 12 11:48:21 UTC 2019 - Adam Majer diff --git a/boost.spec b/boost.spec index 7c641a2..aef6a96 100644 --- a/boost.spec +++ b/boost.spec @@ -16,9 +16,9 @@ # -%define ver 1.70.0 -%define _ver 1_70_0 -%define package_version 1_70_0 +%define ver 1.71.0 +%define _ver 1_71_0 +%define package_version 1_71_0 %define file_version %_ver %define lib_appendix %_ver %define docs_version 1.56.0 @@ -164,9 +164,9 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le %endif Name: %{base_name} -Version: 1.70.0 +Version: 1.71.0 Release: 0 -%define library_version 1_70_0 +%define library_version 1_71_0 Summary: Boost C++ Libraries License: BSL-1.0 @@ -191,13 +191,12 @@ Patch7: boost-rpmoptflags-only.patch Patch9: boost-aarch64-flags.patch Patch10: boost-disable-pch-on-aarch64.patch Patch13: boost-visibility.patch -Patch14: boost-1.57.0-python-libpython_dep.patch Patch15: boost-1.57.0-python-abi_letters.patch Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch Patch17: python_mpi.patch Patch18: dynamic_linking.patch Patch20: python_library_name.patch -Patch21: https://www.boost.org/patches/1_70_0/0001-beast-fix-moved-from-executor.patch +Patch23: 3ecbf83f.patch BuildRequires: fdupes BuildRequires: libbz2-devel BuildRequires: libexpat-devel @@ -1225,13 +1224,12 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch9 -p1 %patch10 -p1 %patch13 -%patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch20 -p1 -%patch21 -p1 +%patch23 -p1 %build find . -type f -exec chmod u+w {} + @@ -1294,8 +1292,8 @@ module load gnu %mpi_flavor # use staging directories for MPI/PYTHON combinations. # General case +# alias boost_python_alias : : /boost/python//boost_python ; cat << EOF >user-config.jam -alias boost_python_alias : : /boost/python//boost_python ; EOF %endif # ! build_base @@ -1399,12 +1397,12 @@ echo 'using mpi ;' >> ./user-config.jam cp %{SOURCE101} . chmod +x symbol_diff.sh %if %{with python3} -./symbol_diff.sh python3-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so -./symbol_diff.sh python3-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so +#./symbol_diff.sh python3-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so +#./symbol_diff.sh python3-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so %endif %if %{with python2} -./symbol_diff.sh python-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so -./symbol_diff.sh python-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so +#./symbol_diff.sh python-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so +#./symbol_diff.sh python-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so %endif #./symbol_diff.sh python-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so #./symbol_diff.sh python-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so @@ -1480,7 +1478,9 @@ module load gnu %mpi_flavor %if ! %{build_base} %if %{with python2} -#ln -s libboost_mpi_python-py2_7.so %{buildroot}%{package_libdir}/libboost_mpi_python.so +rm -r %{buildroot}%{package_libdir}/libboost_python.so +rm -r %{buildroot}%{package_libdir}/libboost_mpi_python.so +ln -s libboost_mpi_python-py2_7.so %{buildroot}%{package_libdir}/libboost_mpi_python.so ln -s libboost_python-py2_7.so %{buildroot}%{package_libdir}/libboost_python.so %endif @@ -1491,19 +1491,19 @@ ln -s libboost_python-py3.so %{buildroot}%{package_libdir}/libboost_python # Move Python libraries over to proper places %if %{with python2} -# mkdir -p %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ -# mv %{buildroot}/%{package_libdir}/mpi.so %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ -# install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ -# install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost/parallel -# install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost +mkdir -p %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ +mv %{buildroot}/%{package_libdir}/mpi.so %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ +install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ +install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost/parallel +install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost %endif %if %{with python3} -# mkdir -p %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/ -# mv %{buildroot}/%{package_libdir}/mpi.*so %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so -# install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/ -# install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost/parallel -# install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost +mkdir -p %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/ +mv %{buildroot}/%{package_libdir}/mpi.*so %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so +install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/ +install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost/parallel +install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost %endif %if ! %{with hpc} @@ -1530,7 +1530,7 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{package_bindir}/quickbook %if %{build_base} mkdir -p %{buildroot}%{package_bindir} -install -m 755 bjam %{buildroot}%{package_bindir} +install -m 755 b2 %{buildroot}%{package_bindir}/bjam ln -s bjam %{buildroot}%{package_bindir}/jam # Remove exception library, but only if the symbols are not @@ -1551,15 +1551,20 @@ mkdir -p %{buildroot}%{_defaultlicensedir} %endif # not used or duplicated in boost-extra flavour -##rm -r %{buildroot}%{package_libdir}/cmake/boost_stacktrace_{backtrace,windbg}* -##rm -r %{buildroot}%{package_libdir}/cmake/boost_exception-* -##rm -r %{buildroot}%{package_libdir}/cmake/boost_graph_parallel-%{version} +rm -r %{buildroot}%{package_libdir}/cmake/boost_stacktrace_{backtrace,windbg}* +rm -r %{buildroot}%{package_libdir}/cmake/boost_exception-* +rm -r %{buildroot}%{package_libdir}/cmake/boost_graph_parallel-%{version} %else # ! build_base # duplicate from boost-base flavour -##rm %{buildroot}%{package_libdir}/cmake/BoostDetectToolset-1.70.0.cmake -##rm -r %{buildroot}%{package_libdir}/cmake/Boost-%{version} -##rm -r %{buildroot}%{package_libdir}/cmake/boost_headers-%{version} -##rm -r %{buildroot}%{package_libdir}/cmake/boost_{w,}serialization-%{version} +rm %{buildroot}%{package_libdir}/cmake/BoostDetectToolset-%{version}.cmake +rm -r %{buildroot}%{package_libdir}/cmake/Boost-%{version} +rm -r %{buildroot}%{package_libdir}/cmake/boost_headers-%{version} +rm -r %{buildroot}%{package_libdir}/cmake/boost_{w,}serialization-%{version} +rm -r %{buildroot}%{package_libdir}/cmake/mpi-%{version} + +rm -r %{buildroot}%{package_libdir}/libboost_numpy.so{,.%{version}} +rm -r %{buildroot}%{package_libdir}/libboost_mpi_python.so.%{version} +rm -r %{buildroot}%{package_libdir}/libboost_python.so.%{version} rm -r %{buildroot}%{package_includedir}/boost rm %{buildroot}%{package_libdir}/libboost_{w,}serialization* @@ -1567,11 +1572,9 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{package_libdir} %fdupes %{buildroot}%{my_docdir} %endif -rm -r %{buildroot}%{package_libdir}/cmake - # Remove bad files - no -f on purpose, so we see when we they fix it. rm %{buildroot}%{package_libdir}/*.so.1 -rm %{buildroot}%{package_libdir}/*.so.1.70 +rm %{buildroot}%{package_libdir}/*.so.1.71 %if %{with hpc} %hpc_write_modules_files @@ -1718,11 +1721,11 @@ EOF %postun -n libboost_mpi%{library_version} -p /sbin/ldconfig %postun -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig %if %{with python2} -#%postun -n libboost_mpi_python-py2_7-%{library_version} -p /sbin/ldconfig +%postun -n libboost_mpi_python-py2_7-%{library_version} -p /sbin/ldconfig %endif %if %{with python3} -#%postun -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig +%postun -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig %endif %endif @@ -1775,16 +1778,16 @@ EOF %{package_libdir}/libboost_atomic.so.%{version} %files -n libboost_atomic%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_atomic-%{version} -##%{package_libdir}/cmake/boost_atomic-%{version}/* +%dir %{package_libdir}/cmake/boost_atomic-%{version} +%{package_libdir}/cmake/boost_atomic-%{version}/* %{package_libdir}/libboost_atomic.so %files -n libboost_container%{library_version} %{package_libdir}/libboost_container.so.%{version} %files -n libboost_container%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_container-%{version} -##%{package_libdir}/cmake/boost_container-%{version}/* +%dir %{package_libdir}/cmake/boost_container-%{version} +%{package_libdir}/cmake/boost_container-%{version}/* %{package_libdir}/libboost_container.so %if %{with build_context} @@ -1792,16 +1795,16 @@ EOF %{package_libdir}/libboost_context.so.%{version} %files -n libboost_context%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_context-%{version} -##%{package_libdir}/cmake/boost_context-%{version}/* +%dir %{package_libdir}/cmake/boost_context-%{version} +%{package_libdir}/cmake/boost_context-%{version}/* %{package_libdir}/libboost_context.so %files -n libboost_coroutine%{library_version} %{package_libdir}/libboost_coroutine.so.%{version} %files -n libboost_coroutine%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_coroutine-%{version} -##%{package_libdir}/cmake/boost_coroutine-%{version}/* +%dir %{package_libdir}/cmake/boost_coroutine-%{version} +%{package_libdir}/cmake/boost_coroutine-%{version}/* %{package_libdir}/libboost_coroutine.so %endif # if with build_context @@ -1810,16 +1813,16 @@ EOF %{package_libdir}/libboost_contract.so.%{version} %files -n libboost_contract%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_contract-%{version} -##%{package_libdir}/cmake/boost_contract-%{version}/* +%dir %{package_libdir}/cmake/boost_contract-%{version} +%{package_libdir}/cmake/boost_contract-%{version}/* %{package_libdir}/libboost_contract.so %files -n libboost_date_time%{library_version} %{package_libdir}/libboost_date_time.so.%{version} %files -n libboost_date_time%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_date_time-%{version} -##%{package_libdir}/cmake/boost_date_time-%{version}/* +%dir %{package_libdir}/cmake/boost_date_time-%{version} +%{package_libdir}/cmake/boost_date_time-%{version}/* %{package_libdir}/libboost_date_time.so %if %{with boost_fiber} @@ -1827,10 +1830,10 @@ EOF %{package_libdir}/libboost_fiber.so.%{version} %files -n libboost_fiber%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_fiber-%{version} -##%dir %{package_libdir}/cmake/boost_fiber_numa-%{version} -#%{package_libdir}/cmake/boost_fiber-%{version}/* -#%{package_libdir}/cmake/boost_fiber_numa-%{version}/* +%dir %{package_libdir}/cmake/boost_fiber-%{version} +%dir %{package_libdir}/cmake/boost_fiber_numa-%{version} +%{package_libdir}/cmake/boost_fiber-%{version}/* +%{package_libdir}/cmake/boost_fiber_numa-%{version}/* %{package_libdir}/libboost_fiber.so %endif # with boost_fiber @@ -1839,24 +1842,24 @@ EOF %{package_libdir}/libboost_filesystem.so.%{version} %files -n libboost_filesystem%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_filesystem-%{version} -#%{package_libdir}/cmake/boost_filesystem-%{version}/* +%dir %{package_libdir}/cmake/boost_filesystem-%{version} +%{package_libdir}/cmake/boost_filesystem-%{version}/* %{package_libdir}/libboost_filesystem.so %files -n libboost_graph%{library_version} %{package_libdir}/libboost_graph.so.%{version} %files -n libboost_graph%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_graph-%{version} -#%{package_libdir}/cmake/boost_graph-%{version}/* +%dir %{package_libdir}/cmake/boost_graph-%{version} +%{package_libdir}/cmake/boost_graph-%{version}/* %{package_libdir}/libboost_graph.so %files -n libboost_iostreams%{library_version} %{package_libdir}/libboost_iostreams.so.%{version} %files -n libboost_iostreams%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_iostreams-%{version} -#%{package_libdir}/cmake/boost_iostreams-%{version}/* +%dir %{package_libdir}/cmake/boost_iostreams-%{version} +%{package_libdir}/cmake/boost_iostreams-%{version}/* %{package_libdir}/libboost_iostreams.so %files -n libboost_log%{library_version} @@ -1864,10 +1867,10 @@ EOF %{package_libdir}/libboost_log_setup.so.%{version} %files -n libboost_log%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_log-%{version} -#%dir %{package_libdir}/cmake/boost_log_setup-%{version} -#%{package_libdir}/cmake/boost_log-%{version}/* -#%{package_libdir}/cmake/boost_log_setup-%{version}/* +%dir %{package_libdir}/cmake/boost_log-%{version} +%dir %{package_libdir}/cmake/boost_log_setup-%{version} +%{package_libdir}/cmake/boost_log-%{version}/* +%{package_libdir}/cmake/boost_log_setup-%{version}/* %{package_libdir}/libboost_log.so %{package_libdir}/libboost_log_setup.so @@ -1880,12 +1883,12 @@ EOF %{package_libdir}/libboost_math_tr1.so.%{version} %files -n libboost_math%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_math-%{version} -#%dir %{package_libdir}/cmake/boost_math_c99*-%{version} -#%dir %{package_libdir}/cmake/boost_math_tr1*-%{version} -#%{package_libdir}/cmake/boost_math-%{version}/* -#%{package_libdir}/cmake/boost_math_c99*-%{version}/* -#%{package_libdir}/cmake/boost_math_tr1*-%{version}/* +%dir %{package_libdir}/cmake/boost_math-%{version} +%dir %{package_libdir}/cmake/boost_math_c99*-%{version} +%dir %{package_libdir}/cmake/boost_math_tr1*-%{version} +%{package_libdir}/cmake/boost_math-%{version}/* +%{package_libdir}/cmake/boost_math_c99*-%{version}/* +%{package_libdir}/cmake/boost_math_tr1*-%{version}/* %{package_libdir}/libboost_math_c99f.so %{package_libdir}/libboost_math_c99l.so %{package_libdir}/libboost_math_c99.so @@ -1899,12 +1902,12 @@ EOF %{package_libdir}/libboost_unit_test_framework.so.%{version} %files -n libboost_test%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_prg_exec_monitor-%{version} -#%dir %{package_libdir}/cmake/boost_test_exec_monitor-%{version} -#%dir %{package_libdir}/cmake/boost_unit_test_framework-%{version} -#%{package_libdir}/cmake/boost_prg_exec_monitor-%{version}/* -#%{package_libdir}/cmake/boost_test_exec_monitor-%{version}/* -#%{package_libdir}/cmake/boost_unit_test_framework-%{version}/* +%dir %{package_libdir}/cmake/boost_prg_exec_monitor-%{version} +%dir %{package_libdir}/cmake/boost_test_exec_monitor-%{version} +%dir %{package_libdir}/cmake/boost_unit_test_framework-%{version} +%{package_libdir}/cmake/boost_prg_exec_monitor-%{version}/* +%{package_libdir}/cmake/boost_test_exec_monitor-%{version}/* +%{package_libdir}/cmake/boost_unit_test_framework-%{version}/* %{package_libdir}/libboost_prg_exec_monitor.so %{package_libdir}/libboost_test_exec_monitor.so %{package_libdir}/libboost_unit_test_framework.so @@ -1913,8 +1916,8 @@ EOF %{package_libdir}/libboost_program_options.so.%{version} %files -n libboost_program_options%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_program_options-%{version} -#%{package_libdir}/cmake/boost_program_options-%{version}/* +%dir %{package_libdir}/cmake/boost_program_options-%{version} +%{package_libdir}/cmake/boost_program_options-%{version}/* %{package_libdir}/libboost_program_options.so %endif # build_base @@ -1925,55 +1928,55 @@ EOF %{package_libdir}/libboost_mpi.so.%{version} %files -n libboost_mpi%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_mpi-%{version} -#%{package_libdir}/cmake/boost_mpi-%{version}/* +%dir %{package_libdir}/cmake/boost_mpi-%{version} +%{package_libdir}/cmake/boost_mpi-%{version}/* %{package_libdir}/libboost_mpi.so %files -n libboost_graph_parallel%{library_version} %{package_libdir}/libboost_graph_parallel.so.%{version} %files -n libboost_graph_parallel%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_graph_parallel-%{version} -#%{package_libdir}/cmake/boost_graph_parallel-%{version}/* +%dir %{package_libdir}/cmake/boost_graph_parallel-%{version} +%{package_libdir}/cmake/boost_graph_parallel-%{version}/* %{package_libdir}/libboost_graph_parallel.so %if %{with python2} %files -n libboost_mpi_python-py2_7-%{library_version} -#%{package_libdir}/libboost_mpi_python-py2_7.so.%{version} +%{package_libdir}/libboost_mpi_python-py2_7.so.%{version} %files -n libboost_mpi_python-py2_7-%{library_version}-devel -##%dir %{package_libdir}/cmake/boost_mpi_python-%{version} -##%{package_libdir}/cmake/boost_mpi_python-%{version}/* -#%{package_libdir}/libboost_mpi_python-py2_7.so -#%{package_libdir}/libboost_mpi_python.so +%dir %{package_libdir}/cmake/boost_mpi_python-%{version} +%{package_libdir}/cmake/boost_mpi_python-%{version}/* +%{package_libdir}/libboost_mpi_python-py2_7.so +%{package_libdir}/libboost_mpi_python.so %files -n python2-boost_parallel_mpi%{library_version} -#%dir %{package_python2_sitearch}/boost -#%dir %{package_python2_sitearch}/boost/parallel -#%dir %{package_python2_sitearch}/boost/parallel/mpi -#%{package_python2_sitearch}/boost/__init__.py -#%{package_python2_sitearch}/boost/parallel/__init__.py -#%{package_python2_sitearch}/boost/parallel/mpi/__init__.py -#%{package_python2_sitearch}/boost/parallel/mpi/mpi.so +%dir %{package_python2_sitearch}/boost +%dir %{package_python2_sitearch}/boost/parallel +%dir %{package_python2_sitearch}/boost/parallel/mpi +%{package_python2_sitearch}/boost/__init__.py +%{package_python2_sitearch}/boost/parallel/__init__.py +%{package_python2_sitearch}/boost/parallel/mpi/__init__.py +%{package_python2_sitearch}/boost/parallel/mpi/mpi.so %endif # with python2 %if %{with python3} %files -n libboost_mpi_python-py3-%{library_version} -# %{package_libdir}/libboost_mpi_python-py3.so.%{version} +%{package_libdir}/libboost_mpi_python-py3.so.%{version} %files -n libboost_mpi_python-py3-%{library_version}-devel ##%dir %{package_libdir}/cmake/boost_mpi_python-%{version} ##%{package_libdir}/cmake/boost_mpi_python-%{version}/* -#%{package_libdir}/libboost_mpi_python-py3.so +%{package_libdir}/libboost_mpi_python-py3.so %files -n python3-boost_parallel_mpi%{library_version} -#%dir %{package_python3_sitearch}/boost -#%dir %{package_python3_sitearch}/boost/parallel -#%dir %{package_python3_sitearch}/boost/parallel/mpi -#%{package_python3_sitearch}/boost/__init__.py -#%{package_python3_sitearch}/boost/parallel/__init__.py -#%{package_python3_sitearch}/boost/parallel/mpi/__init__.py -#%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so +%dir %{package_python3_sitearch}/boost +%dir %{package_python3_sitearch}/boost/parallel +%dir %{package_python3_sitearch}/boost/parallel/mpi +%{package_python3_sitearch}/boost/__init__.py +%{package_python3_sitearch}/boost/parallel/__init__.py +%{package_python3_sitearch}/boost/parallel/mpi/__init__.py +%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so %endif # with python3 %endif # with build_mpi @@ -2005,8 +2008,8 @@ EOF %{package_libdir}/libboost_python-py3.so.%{version} %files -n libboost_python-py3-%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_python-%{version} -#%{package_libdir}/cmake/boost_python-%{version}/* +%dir %{package_libdir}/cmake/boost_python-%{version} +%{package_libdir}/cmake/boost_python-%{version}/* %{package_libdir}/libboost_python3.so %{package_libdir}/libboost_python-py3.so @@ -2015,8 +2018,8 @@ EOF %{package_libdir}/libboost_numpy-py3.so.%{version} %files -n libboost_numpy-py3-%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_numpy-%{version} -#%{package_libdir}/cmake/boost_numpy-%{version}/* +%dir %{package_libdir}/cmake/boost_numpy-%{version} +%{package_libdir}/cmake/boost_numpy-%{version}/* %{package_libdir}/libboost_numpy-py3.so %endif # with numpy @@ -2029,10 +2032,10 @@ EOF %{package_libdir}/libboost_wserialization.so.%{version} %files -n libboost_serialization%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_serialization-%{version} -#%dir %{package_libdir}/cmake/boost_wserialization-%{version} -#%{package_libdir}/cmake/boost_serialization-%{version}/* -#%{package_libdir}/cmake/boost_wserialization-%{version}/* +%dir %{package_libdir}/cmake/boost_serialization-%{version} +%dir %{package_libdir}/cmake/boost_wserialization-%{version} +%{package_libdir}/cmake/boost_serialization-%{version}/* +%{package_libdir}/cmake/boost_wserialization-%{version}/* %{package_libdir}/libboost_serialization.so %{package_libdir}/libboost_wserialization.so @@ -2042,12 +2045,12 @@ EOF %{package_libdir}/libboost_stacktrace_noop.so.%{version} %files -n libboost_stacktrace%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_stacktrace_addr2line-%{version} -#%dir %{package_libdir}/cmake/boost_stacktrace_basic-%{version} -#%dir %{package_libdir}/cmake/boost_stacktrace_noop-%{version} -#%{package_libdir}/cmake/boost_stacktrace_addr2line-%{version}/* -#%{package_libdir}/cmake/boost_stacktrace_basic-%{version}/* -#%{package_libdir}/cmake/boost_stacktrace_noop-%{version}/* +%dir %{package_libdir}/cmake/boost_stacktrace_addr2line-%{version} +%dir %{package_libdir}/cmake/boost_stacktrace_basic-%{version} +%dir %{package_libdir}/cmake/boost_stacktrace_noop-%{version} +%{package_libdir}/cmake/boost_stacktrace_addr2line-%{version}/* +%{package_libdir}/cmake/boost_stacktrace_basic-%{version}/* +%{package_libdir}/cmake/boost_stacktrace_noop-%{version}/* %{package_libdir}/libboost_stacktrace_addr2line.so %{package_libdir}/libboost_stacktrace_basic.so %{package_libdir}/libboost_stacktrace_noop.so @@ -2056,72 +2059,72 @@ EOF %{package_libdir}/libboost_system.so.%{version} %files -n libboost_system%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_system-%{version} -#%{package_libdir}/cmake/boost_system-%{version}/* +%dir %{package_libdir}/cmake/boost_system-%{version} +%{package_libdir}/cmake/boost_system-%{version}/* %{package_libdir}/libboost_system.so %files -n libboost_thread%{library_version} %{package_libdir}/libboost_thread.so.%{version} %files -n libboost_thread%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_thread-%{version} -#%{package_libdir}/cmake/boost_thread-%{version}/* +%dir %{package_libdir}/cmake/boost_thread-%{version} +%{package_libdir}/cmake/boost_thread-%{version}/* %{package_libdir}/libboost_thread.so %files -n libboost_wave%{library_version} %{package_libdir}/libboost_wave.so.%{version} %files -n libboost_wave%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_wave-%{version} -#%{package_libdir}/cmake/boost_wave-%{version}/* +%dir %{package_libdir}/cmake/boost_wave-%{version} +%{package_libdir}/cmake/boost_wave-%{version}/* %{package_libdir}/libboost_wave.so %files -n libboost_regex%{library_version} %{package_libdir}/libboost_regex.so.%{version} %files -n libboost_regex%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_regex-%{version} -#%{package_libdir}/cmake/boost_regex-%{version}/* +%dir %{package_libdir}/cmake/boost_regex-%{version} +%{package_libdir}/cmake/boost_regex-%{version}/* %{package_libdir}/libboost_regex.so %files -n libboost_random%{library_version} %{package_libdir}/libboost_random.so.%{version} %files -n libboost_random%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_random-%{version} -#%{package_libdir}/cmake/boost_random-%{version}/* +%dir %{package_libdir}/cmake/boost_random-%{version} +%{package_libdir}/cmake/boost_random-%{version}/* %{package_libdir}/libboost_random.so %files -n libboost_chrono%{library_version} %{package_libdir}/libboost_chrono.so.%{version} %files -n libboost_chrono%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_chrono-%{version} -#%{package_libdir}/cmake/boost_chrono-%{version}/* +%dir %{package_libdir}/cmake/boost_chrono-%{version} +%{package_libdir}/cmake/boost_chrono-%{version}/* %{package_libdir}/libboost_chrono.so %files -n libboost_locale%{library_version} %{package_libdir}/libboost_locale.so.%{version} %files -n libboost_locale%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_locale-%{version} -#%{package_libdir}/cmake/boost_locale-%{version}/* +%dir %{package_libdir}/cmake/boost_locale-%{version} +%{package_libdir}/cmake/boost_locale-%{version}/* %{package_libdir}/libboost_locale.so %files -n libboost_timer%{library_version} %{package_libdir}/libboost_timer.so.%{version} %files -n libboost_timer%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_timer-%{version} -#%{package_libdir}/cmake/boost_timer-%{version}/* +%dir %{package_libdir}/cmake/boost_timer-%{version} +%{package_libdir}/cmake/boost_timer-%{version}/* %{package_libdir}/libboost_timer.so %files -n libboost_type_erasure%{library_version} %{package_libdir}/libboost_type_erasure.so.%{version} %files -n libboost_type_erasure%{library_version}-devel -#%dir %{package_libdir}/cmake/boost_type_erasure-%{version} -#%{package_libdir}/cmake/boost_type_erasure-%{version}/* +%dir %{package_libdir}/cmake/boost_type_erasure-%{version} +%{package_libdir}/cmake/boost_type_erasure-%{version}/* %{package_libdir}/libboost_type_erasure.so %endif # if build_base @@ -2159,13 +2162,13 @@ EOF %if %{build_base} %files -n libboost_headers%{library_version}-devel -#%dir %{package_libdir}/cmake -#%dir %{package_libdir}/cmake/Boost-%{version} -#%dir %{package_libdir}/cmake/boost_headers-%{version} +%dir %{package_libdir}/cmake +%dir %{package_libdir}/cmake/Boost-%{version} +%dir %{package_libdir}/cmake/boost_headers-%{version} %dir %{package_includedir}/boost -#%{package_libdir}/cmake/BoostDetectToolset-%{version}.cmake -#%{package_libdir}/cmake/Boost-%{version}/* -#%{package_libdir}/cmake/boost_headers-%{version}/* +%{package_libdir}/cmake/BoostDetectToolset-%{version}.cmake +%{package_libdir}/cmake/Boost-%{version}/* +%{package_libdir}/cmake/boost_headers-%{version}/* %{package_includedir}/boost/* %files -n boost-license%{library_version} diff --git a/boost_1_70_0.tar.bz2 b/boost_1_70_0.tar.bz2 deleted file mode 100644 index e939d11..0000000 --- a/boost_1_70_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 -size 97887058 diff --git a/boost_1_71_0.tar.bz2 b/boost_1_71_0.tar.bz2 new file mode 100644 index 0000000..2db0262 --- /dev/null +++ b/boost_1_71_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee +size 100124647 diff --git a/remove_boost_serialization_depends.patch b/remove_boost_serialization_depends.patch new file mode 100644 index 0000000..dbfc3db --- /dev/null +++ b/remove_boost_serialization_depends.patch @@ -0,0 +1,35 @@ +If boost_mpi is built with python extention, boost_serialization +dependency barfs with, + +error: Name clash for '

libboost_serialization.so.1.70.0' +error: +error: Tried to build the target twice, with property sets having +error: these incompatible properties: +error: +error: - /usr/lib64/python2.7 +error: - none +error: +error: Please make sure to have consistent requirements for these +error: properties everywhere in your project, especially for install +error: targets. + +Index: boost_1_70_0/libs/mpi/build/Jamfile.v2 +=================================================================== +--- boost_1_70_0.orig/libs/mpi/build/Jamfile.v2 ++++ boost_1_70_0/libs/mpi/build/Jamfile.v2 +@@ -108,7 +108,6 @@ lib boost_mpi + timer.cpp + offsets.cpp + : # Requirements +- ../../serialization/build//boost_serialization + /mpi//mpi [ mpi.extra-requirements ] + BOOST_MPI_SOURCE=1 + shared:BOOST_MPI_DYN_LINK=1 +@@ -116,7 +115,6 @@ lib boost_mpi + : # Default build + shared + : # Usage requirements +- ../../serialization/build//boost_serialization + /mpi//mpi [ mpi.extra-requirements ] + ; +