Accepting request 702030 from home:adamm:boost_test
- Update to version 1.70.0
Breaking changes:
* beast - there were many API changes. For details, see upstream
release notes
New libraries:
* outcome: A set of tools for reporting and handling function
failures in contexts where directly using exception handling
is unsuitable
* histogram: Fast and extensible multi-dimensional histograms
Updated libraries:
* asio, beast, context, coroutine2, dynamic bitset, fiber,
filesystem, integer, log, math, mp11, multi-index containers,
multiprecision, polycollection, spirit, stacktrace, test,
typeindex, typetraits, variant and ublas.
For detailed changes see
https://www.boost.org/users/history/version_1_70_0.html
- 0001-beast-fix-moved-from-executor.patch: upstream patch to fix regresion
- boost-rpmoptflags-only.patch: refresh but don't disable all extra
warnings
- dynamic_linking.patch: refreshed
- baselibs.conf - updated to 1.70.0
OBS-URL: https://build.opensuse.org/request/show/702030
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=231
This commit is contained in:
Git OBS Bridge
parent
14e8afec10
commit
a22f8692bb
89
0001-beast-fix-moved-from-executor.patch
Normal file
89
0001-beast-fix-moved-from-executor.patch
Normal file
@ -0,0 +1,89 @@
|
||||
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 <boost/beast/websocket/stream.hpp>
|
||||
|
||||
+#include <boost/beast/_experimental/test/tcp.hpp>
|
||||
+
|
||||
#include "test.hpp"
|
||||
|
||||
+#include <boost/asio/ip/tcp.hpp>
|
||||
#include <boost/asio/io_context.hpp>
|
||||
#include <boost/asio/strand.hpp>
|
||||
|
||||
@@ -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<socket_type> ws1(ioc);
|
||||
+ stream<socket_type> 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;
|
||||
@ -1,25 +1,25 @@
|
||||
libboost_atomic1_69_0
|
||||
libboost_container1_69_0
|
||||
libboost_context1_69_0
|
||||
libboost_coroutine1_69_0
|
||||
libboost_date_time1_69_0
|
||||
libboost_fiber1_69_0
|
||||
libboost_filesystem1_69_0
|
||||
libboost_graph1_69_0
|
||||
libboost_graph_parallel1_69_0
|
||||
libboost_iostreams1_69_0
|
||||
libboost_locale1_69_0
|
||||
libboost_math1_69_0
|
||||
libboost_mpi1_69_0
|
||||
libboost_test1_69_0
|
||||
libboost_program_options1_69_0
|
||||
libboost_python-py2_7-1_69_0
|
||||
libboost_python-py3-1_69_0
|
||||
libboost_random1_69_0
|
||||
libboost_serialization1_69_0
|
||||
libboost_stacktrace1_69_0
|
||||
libboost_system1_69_0
|
||||
libboost_thread1_69_0
|
||||
libboost_type_erasure1_69_0
|
||||
libboost_wave1_69_0
|
||||
libboost_regex1_69_0
|
||||
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
|
||||
|
||||
@ -2,7 +2,7 @@ Index: tools/build/src/tools/gcc.jam
|
||||
===================================================================
|
||||
--- tools/build/src/tools/gcc.jam.orig
|
||||
+++ tools/build/src/tools/gcc.jam
|
||||
@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc
|
||||
@@ -569,7 +569,7 @@ rule compile.fortran ( targets * : sourc
|
||||
|
||||
actions compile.c++ bind PCH_FILE
|
||||
{
|
||||
@ -11,7 +11,7 @@ Index: tools/build/src/tools/gcc.jam
|
||||
}
|
||||
|
||||
actions compile.c bind PCH_FILE
|
||||
@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE
|
||||
@@ -579,7 +579,7 @@ actions compile.c bind PCH_FILE
|
||||
|
||||
actions compile.c++.preprocess bind PCH_FILE
|
||||
{
|
||||
@ -20,7 +20,7 @@ Index: tools/build/src/tools/gcc.jam
|
||||
}
|
||||
|
||||
actions compile.c.preprocess bind PCH_FILE
|
||||
@@ -755,17 +755,17 @@ actions compile.c.pch
|
||||
@@ -702,15 +702,15 @@ actions compile.c.pch
|
||||
###
|
||||
|
||||
# Declare flags and action for compilation.
|
||||
@ -31,10 +31,6 @@ Index: tools/build/src/tools/gcc.jam
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
|
||||
-
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||
@ -42,10 +38,9 @@ Index: tools/build/src/tools/gcc.jam
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>full : ;
|
||||
+
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
||||
toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||
|
||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||
toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
||||
toolset.flags gcc.compile OPTIONS <warnings>all : -Wall ;
|
||||
toolset.flags gcc.compile OPTIONS <warnings>extra : -Wall -Wextra ;
|
||||
|
||||
@ -1,3 +1,33 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 12 11:48:21 UTC 2019 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
- Update to version 1.70.0
|
||||
|
||||
Breaking changes:
|
||||
* beast - there were many API changes. For details, see upstream
|
||||
release notes
|
||||
|
||||
New libraries:
|
||||
* outcome: A set of tools for reporting and handling function
|
||||
failures in contexts where directly using exception handling
|
||||
is unsuitable
|
||||
* histogram: Fast and extensible multi-dimensional histograms
|
||||
|
||||
Updated libraries:
|
||||
* asio, beast, context, coroutine2, dynamic bitset, fiber,
|
||||
filesystem, integer, log, math, mp11, multi-index containers,
|
||||
multiprecision, polycollection, spirit, stacktrace, test,
|
||||
typeindex, typetraits, variant and ublas.
|
||||
|
||||
For detailed changes see
|
||||
https://www.boost.org/users/history/version_1_70_0.html
|
||||
|
||||
- 0001-beast-fix-moved-from-executor.patch: upstream patch to fix regresion
|
||||
- boost-rpmoptflags-only.patch: refresh but don't disable all extra
|
||||
warnings
|
||||
- dynamic_linking.patch: refreshed
|
||||
- baselibs.conf - updated to 1.70.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 8 14:57:09 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
224
boost.spec
224
boost.spec
@ -12,13 +12,13 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define ver 1.69.0
|
||||
%define _ver 1_69_0
|
||||
%define package_version 1_69
|
||||
%define ver 1.70.0
|
||||
%define _ver 1_70_0
|
||||
%define package_version 1_70_0
|
||||
%define file_version %_ver
|
||||
%define lib_appendix %_ver
|
||||
%define docs_version 1.56.0
|
||||
@ -37,9 +37,12 @@
|
||||
%define python2_sitearch %{python_sitearch}
|
||||
%endif
|
||||
|
||||
%if "@BUILD_FLAVOR@" == "%nil"
|
||||
%define build_base 0
|
||||
# We can't have these inside the "@BUILD_FLAVOR@" because then quilt
|
||||
# can't understand the spec file. If only @BUILD_FLAVOR@ was a normal macro....
|
||||
%define build_base 1
|
||||
%define name_suffix %{nil}
|
||||
|
||||
%if "@BUILD_FLAVOR@" == "%nil"
|
||||
ExclusiveArch: do_not_build
|
||||
%endif
|
||||
|
||||
@ -79,7 +82,7 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%bcond_without python2
|
||||
%bcond_without python3
|
||||
%if %{with ringdisabled}
|
||||
ExclusiveArch: do-not-build
|
||||
ExclusiveArch: do-not-build
|
||||
%else
|
||||
ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%endif
|
||||
@ -96,7 +99,7 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%bcond_without python2
|
||||
%bcond_without python3
|
||||
%if %{with ringdisabled}
|
||||
ExclusiveArch: do-not-build
|
||||
ExclusiveArch: do-not-build
|
||||
%else
|
||||
ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%endif
|
||||
@ -161,9 +164,9 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%endif
|
||||
|
||||
Name: %{base_name}
|
||||
Version: 1.69.0
|
||||
Version: 1.70.0
|
||||
Release: 0
|
||||
%define library_version 1_69_0
|
||||
%define library_version 1_70_0
|
||||
|
||||
Summary: Boost C++ Libraries
|
||||
License: BSL-1.0
|
||||
@ -194,6 +197,7 @@ 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
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: libexpat-devel
|
||||
@ -264,7 +268,7 @@ Group: Development/Libraries/C and C++
|
||||
Requires: boost-license%{library_version}
|
||||
Requires: libstdc++-devel
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_headers-devel < 1.69
|
||||
Conflicts: libboost_headers-devel < %{version}
|
||||
Conflicts: libboost_headers-devel-impl
|
||||
Provides: libboost_headers-devel-impl = %{version}
|
||||
|
||||
@ -501,6 +505,7 @@ Summary: Development headers for Boost.Contract
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_contract%{library_version} = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_system%{library_version}-devel = %{version}
|
||||
Requires: libstdc++-devel
|
||||
Conflicts: libboost_contract-devel-impl
|
||||
Provides: libboost_contract-devel-impl = %{version}
|
||||
@ -520,9 +525,11 @@ This package contains the Boost Coroutine runtime library.
|
||||
%package -n libboost_coroutine%{library_version}-devel
|
||||
Summary: Development headers for Boost.Coroutine
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_chrono%{library_version}-devel = %{version}
|
||||
Requires: libboost_context%{library_version}-devel = %{version}
|
||||
Requires: libboost_coroutine%{library_version} = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_thread%{library_version}-devel = %{version}
|
||||
Requires: libstdc++-devel
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_coroutine-devel-impl
|
||||
@ -547,7 +554,6 @@ Group: Development/Libraries/C and C++
|
||||
Requires: libboost_date_time%{library_version} = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libstdc++-devel
|
||||
Recommends: libboost_serialization%{library_version}-devel = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_date_time-devel-impl
|
||||
Provides: libboost_date_time-devel-impl = %{version}
|
||||
@ -569,6 +575,7 @@ Summary: Development headers for Boost.Fiber library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_context%{library_version}-devel = %{version}
|
||||
Requires: libboost_fiber%{library_version} = %{version}
|
||||
Requires: libboost_filesystem%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libstdc++-devel
|
||||
Conflicts: boost-devel < 1.63
|
||||
@ -616,7 +623,7 @@ Summary: Development headers for Boost.Graph library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_graph%{library_version} = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
## FIXME:!!!! need better list of requirements here
|
||||
Requires: libboost_regex%{library_version}-devel = %{version}
|
||||
Requires: libstdc++-devel
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_graph-devel-impl
|
||||
@ -660,9 +667,13 @@ This package contains runtime library for Boost.Log.
|
||||
%package -n libboost_log%{library_version}-devel
|
||||
Summary: Development headers for Boost.Log library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_atomic%{library_version}-devel = %{version}
|
||||
Requires: libboost_chrono%{library_version}-devel = %{version}
|
||||
Requires: libboost_date_time%{library_version}-devel = %{version}
|
||||
Requires: libboost_filesystem%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_log%{library_version} = %{version}
|
||||
Requires: libboost_regex%{library_version}-devel = %{version}
|
||||
Requires: libboost_thread%{library_version} = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_log-devel-impl
|
||||
@ -1035,9 +1046,12 @@ This package contains the Boost::Wave runtime library.
|
||||
%package -n libboost_wave%{library_version}-devel
|
||||
Summary: Development headers for Boost.Wave library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_chrono%{library_version}-devel = %{version}
|
||||
Requires: libboost_date_time%{library_version}-devel = %{version}
|
||||
Requires: libboost_filesystem%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_serialization%{library_version}-devel = %{version}
|
||||
Requires: libboost_thread%{library_version}-devel = %{version}
|
||||
Requires: libboost_wave%{library_version} = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_wave-devel-impl
|
||||
@ -1079,6 +1093,7 @@ Summary: Development headers for Boost.Random library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_random%{library_version} = %{version}
|
||||
Requires: libboost_system%{library_version}-devel = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_random-devel-impl
|
||||
Provides: libboost_random-devel-impl = %{version}
|
||||
@ -1117,8 +1132,11 @@ This package contains Boost::Locale runtime library.
|
||||
%package -n libboost_locale%{library_version}-devel
|
||||
Summary: Development headers for Boost.Locale library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_chrono%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_locale%{library_version} = %{version}
|
||||
Requires: libboost_system%{library_version}-devel = %{version}
|
||||
Requires: libboost_thread%{library_version}-devel = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_locale-devel-impl
|
||||
Provides: libboost_locale-devel-impl = %{version}
|
||||
@ -1137,6 +1155,7 @@ This package contains Boost.Timer runtime library.
|
||||
%package -n libboost_timer%{library_version}-devel
|
||||
Summary: Development headers for Boost.Timer library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_chrono%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_timer%{library_version} = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
@ -1157,7 +1176,10 @@ This package contains Boost::TypeErasure runtime library.
|
||||
%package -n libboost_type_erasure%{library_version}-devel
|
||||
Summary: Development headers for Boost.TypeErasure library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_chrono%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_system%{library_version}-devel = %{version}
|
||||
Requires: libboost_thread%{library_version}-devel = %{version}
|
||||
Requires: libboost_type_erasure%{library_version} = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_type_erasure-devel-impl
|
||||
@ -1209,6 +1231,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
|
||||
%build
|
||||
find . -type f -exec chmod u+w {} +
|
||||
@ -1457,7 +1480,7 @@ 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
|
||||
#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
|
||||
|
||||
@ -1468,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}
|
||||
@ -1526,13 +1549,30 @@ mkdir -p %{buildroot}%{my_docdir}
|
||||
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120200 && !0%{?is_opensuse}
|
||||
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}
|
||||
%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 -r %{buildroot}%{package_includedir}/boost
|
||||
rm %{buildroot}%{package_libdir}/libboost_serialization*
|
||||
rm %{buildroot}%{package_libdir}/libboost_{w,}serialization*
|
||||
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
|
||||
|
||||
%if %{with hpc}
|
||||
%hpc_write_modules_files
|
||||
#%%Module1.0#####################################################################
|
||||
@ -1678,11 +1718,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
|
||||
|
||||
@ -1715,7 +1755,7 @@ EOF
|
||||
%if ! %{with mpi}
|
||||
%files -n %{package_name}-jam
|
||||
%package_bindir
|
||||
%endif # !
|
||||
%endif # ! with mpi
|
||||
%if %{with python2}
|
||||
%files -n %{package_name}-python2
|
||||
%package_python2_sitearch
|
||||
@ -1735,12 +1775,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}/*
|
||||
%{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}/*
|
||||
%{package_libdir}/libboost_container.so
|
||||
|
||||
%if %{with build_context}
|
||||
@ -1748,12 +1792,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}/*
|
||||
%{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}/*
|
||||
%{package_libdir}/libboost_coroutine.so
|
||||
|
||||
%endif # if with build_context
|
||||
@ -1762,12 +1810,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}/*
|
||||
%{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}/*
|
||||
%{package_libdir}/libboost_date_time.so
|
||||
|
||||
%if %{with boost_fiber}
|
||||
@ -1775,6 +1827,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}/*
|
||||
%{package_libdir}/libboost_fiber.so
|
||||
|
||||
%endif # with boost_fiber
|
||||
@ -1783,18 +1839,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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{package_libdir}/libboost_iostreams.so
|
||||
|
||||
%files -n libboost_log%{library_version}
|
||||
@ -1802,6 +1864,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}/*
|
||||
%{package_libdir}/libboost_log.so
|
||||
%{package_libdir}/libboost_log_setup.so
|
||||
|
||||
@ -1814,6 +1880,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}/*
|
||||
%{package_libdir}/libboost_math_c99f.so
|
||||
%{package_libdir}/libboost_math_c99l.so
|
||||
%{package_libdir}/libboost_math_c99.so
|
||||
@ -1827,6 +1899,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}/*
|
||||
%{package_libdir}/libboost_prg_exec_monitor.so
|
||||
%{package_libdir}/libboost_test_exec_monitor.so
|
||||
%{package_libdir}/libboost_unit_test_framework.so
|
||||
@ -1835,6 +1913,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}/*
|
||||
%{package_libdir}/libboost_program_options.so
|
||||
%endif # build_base
|
||||
|
||||
@ -1845,47 +1925,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}/*
|
||||
%{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}/*
|
||||
%{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
|
||||
%{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
|
||||
%{package_libdir}/libboost_mpi_python-py3.so
|
||||
##%dir %{package_libdir}/cmake/boost_mpi_python-%{version}
|
||||
##%{package_libdir}/cmake/boost_mpi_python-%{version}/*
|
||||
#%{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
|
||||
@ -1895,6 +1983,8 @@ EOF
|
||||
%{package_libdir}/libboost_python-py2_7.so.%{version}
|
||||
|
||||
%files -n libboost_python-py2_7-%{library_version}-devel
|
||||
##%dir %{package_libdir}/cmake/boost_python-%{version}
|
||||
##%{package_libdir}/cmake/boost_python-%{version}/*
|
||||
%{package_libdir}/libboost_python.so
|
||||
%{package_libdir}/libboost_python-py2_7.so
|
||||
|
||||
@ -1903,6 +1993,8 @@ EOF
|
||||
%{package_libdir}/libboost_numpy-py2_7.so.%{version}
|
||||
|
||||
%files -n libboost_numpy-py2_7-%{library_version}-devel
|
||||
##%dir %{package_libdir}/cmake/boost_numpy-%{version}
|
||||
##%{package_libdir}/cmake/boost_numpy-%{version}/*
|
||||
%{package_libdir}/libboost_numpy-py2_7.so
|
||||
|
||||
%endif # with numpy
|
||||
@ -1913,6 +2005,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}/*
|
||||
%{package_libdir}/libboost_python3.so
|
||||
%{package_libdir}/libboost_python-py3.so
|
||||
|
||||
@ -1921,6 +2015,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}/*
|
||||
%{package_libdir}/libboost_numpy-py3.so
|
||||
|
||||
%endif # with numpy
|
||||
@ -1933,6 +2029,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}/*
|
||||
%{package_libdir}/libboost_serialization.so
|
||||
%{package_libdir}/libboost_wserialization.so
|
||||
|
||||
@ -1942,6 +2042,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}/*
|
||||
%{package_libdir}/libboost_stacktrace_addr2line.so
|
||||
%{package_libdir}/libboost_stacktrace_basic.so
|
||||
%{package_libdir}/libboost_stacktrace_noop.so
|
||||
@ -1950,54 +2056,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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{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}/*
|
||||
%{package_libdir}/libboost_type_erasure.so
|
||||
%endif # if build_base
|
||||
|
||||
@ -2035,7 +2159,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_includedir}/boost
|
||||
#%{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}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
|
||||
size 95078138
|
||||
3
boost_1_70_0.tar.bz2
Normal file
3
boost_1_70_0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
|
||||
size 97887058
|
||||
@ -1,8 +1,8 @@
|
||||
Index: boost_1_69_0/libs/test/build/Jamfile.v2
|
||||
Index: boost_1_70_0/libs/test/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_69_0.orig/libs/test/build/Jamfile.v2
|
||||
+++ boost_1_69_0/libs/test/build/Jamfile.v2
|
||||
@@ -102,7 +102,7 @@ lib boost_test_exec_monitor
|
||||
--- boost_1_70_0.orig/libs/test/build/Jamfile.v2
|
||||
+++ boost_1_70_0/libs/test/build/Jamfile.v2
|
||||
@@ -95,7 +95,7 @@ lib boost_test_exec_monitor
|
||||
: # sources
|
||||
$(TEST_EXEC_MON_SOURCES).cpp
|
||||
: # requirements
|
||||
@ -11,10 +11,10 @@ Index: boost_1_69_0/libs/test/build/Jamfile.v2
|
||||
: # default build
|
||||
: # usage-requirements
|
||||
<link>shared:<define>BOOST_TEST_DYN_LINK=1
|
||||
Index: boost_1_69_0/libs/exception/build/Jamfile.v2
|
||||
Index: boost_1_70_0/libs/exception/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_69_0.orig/libs/exception/build/Jamfile.v2
|
||||
+++ boost_1_69_0/libs/exception/build/Jamfile.v2
|
||||
--- boost_1_70_0.orig/libs/exception/build/Jamfile.v2
|
||||
+++ boost_1_70_0/libs/exception/build/Jamfile.v2
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
project boost/exception
|
||||
@ -24,11 +24,11 @@ Index: boost_1_69_0/libs/exception/build/Jamfile.v2
|
||||
;
|
||||
|
||||
lib boost_exception : clone_current_exception_non_intrusive.cpp ;
|
||||
Index: boost_1_69_0/libs/chrono/build/Jamfile.v2
|
||||
Index: boost_1_70_0/libs/chrono/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_69_0.orig/libs/chrono/build/Jamfile.v2
|
||||
+++ boost_1_69_0/libs/chrono/build/Jamfile.v2
|
||||
@@ -97,7 +97,7 @@ project boost/chrono
|
||||
--- boost_1_70_0.orig/libs/chrono/build/Jamfile.v2
|
||||
+++ boost_1_70_0/libs/chrono/build/Jamfile.v2
|
||||
@@ -93,7 +93,7 @@ project boost/chrono
|
||||
<toolset>sun:<define>__typeof__=__typeof__
|
||||
|
||||
<link>shared:<define>BOOST_CHRONO_DYN_LINK=1
|
||||
@ -37,7 +37,7 @@ Index: boost_1_69_0/libs/chrono/build/Jamfile.v2
|
||||
<toolset>gcc-3.4.4:<linkflags>--enable-auto-import
|
||||
<toolset>gcc-4.3.4:<linkflags>--enable-auto-import
|
||||
<toolset>gcc-4.4.0,<target-os>windows:<linkflags>--enable-auto-import
|
||||
@@ -111,6 +111,6 @@ lib boost_chrono
|
||||
@@ -107,7 +107,7 @@ lib boost_chrono
|
||||
: $(SOURCES).cpp
|
||||
:
|
||||
<link>shared:<define>BOOST_ALL_DYN_LINK=1 # tell source we're building dll's
|
||||
@ -45,10 +45,11 @@ Index: boost_1_69_0/libs/chrono/build/Jamfile.v2
|
||||
+ # <link>static:<define>BOOST_All_STATIC_LINK=1 # tell source we're building static lib's
|
||||
;
|
||||
|
||||
Index: boost_1_69_0/libs/system/build/Jamfile.v2
|
||||
boost-install boost_chrono ;
|
||||
Index: boost_1_70_0/libs/system/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_69_0.orig/libs/system/build/Jamfile.v2
|
||||
+++ boost_1_69_0/libs/system/build/Jamfile.v2
|
||||
--- boost_1_70_0.orig/libs/system/build/Jamfile.v2
|
||||
+++ boost_1_70_0/libs/system/build/Jamfile.v2
|
||||
@@ -11,7 +11,7 @@ project boost/system
|
||||
: source-location ../src
|
||||
: usage-requirements # pass these requirement to dependents (i.e. users)
|
||||
@ -67,12 +68,12 @@ Index: boost_1_69_0/libs/system/build/Jamfile.v2
|
||||
;
|
||||
|
||||
boost-install boost_system ;
|
||||
Index: boost_1_69_0/libs/timer/build/Jamfile.v2
|
||||
Index: boost_1_70_0/libs/timer/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_69_0.orig/libs/timer/build/Jamfile.v2
|
||||
+++ boost_1_69_0/libs/timer/build/Jamfile.v2
|
||||
@@ -14,7 +14,7 @@ project boost/timer
|
||||
<library>/boost/system//boost_system
|
||||
--- boost_1_70_0.orig/libs/timer/build/Jamfile.v2
|
||||
+++ boost_1_70_0/libs/timer/build/Jamfile.v2
|
||||
@@ -13,7 +13,7 @@ project boost/timer
|
||||
<library>/boost/chrono//boost_chrono
|
||||
: usage-requirements # pass these requirement to dependants (i.e. users)
|
||||
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_TIMER_STATIC_LINK=1
|
||||
@ -80,7 +81,7 @@ Index: boost_1_69_0/libs/timer/build/Jamfile.v2
|
||||
;
|
||||
|
||||
SOURCES = auto_timers_construction cpu_timer ;
|
||||
@@ -22,7 +22,7 @@ SOURCES = auto_timers_construction cpu_t
|
||||
@@ -21,7 +21,7 @@ SOURCES = auto_timers_construction cpu_t
|
||||
lib boost_timer
|
||||
: $(SOURCES).cpp
|
||||
: <link>shared:<define>BOOST_TIMER_DYN_LINK=1
|
||||
@ -89,10 +90,10 @@ Index: boost_1_69_0/libs/timer/build/Jamfile.v2
|
||||
;
|
||||
|
||||
boost-install boost_timer ;
|
||||
Index: boost_1_69_0/libs/filesystem/build/Jamfile.v2
|
||||
Index: boost_1_70_0/libs/filesystem/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_69_0.orig/libs/filesystem/build/Jamfile.v2
|
||||
+++ boost_1_69_0/libs/filesystem/build/Jamfile.v2
|
||||
--- boost_1_70_0.orig/libs/filesystem/build/Jamfile.v2
|
||||
+++ boost_1_70_0/libs/filesystem/build/Jamfile.v2
|
||||
@@ -11,7 +11,7 @@ project boost/filesystem
|
||||
: source-location ../src
|
||||
: usage-requirements # pass these requirement to dependents (i.e. users)
|
||||
@ -104,10 +105,10 @@ Index: boost_1_69_0/libs/filesystem/build/Jamfile.v2
|
||||
SOURCES =
|
||||
@@ -28,7 +28,7 @@ SOURCES =
|
||||
lib boost_filesystem
|
||||
: $(SOURCES).cpp ../../system/build//boost_system
|
||||
: $(SOURCES).cpp
|
||||
: <link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_FILESYSTEM_STATIC_LINK=1
|
||||
+# <link>static:<define>BOOST_FILESYSTEM_STATIC_LINK=1
|
||||
:
|
||||
: # Boost.Filesystem uses some of Boost.System functions in inlined/templated
|
||||
# functions, so clients that use Boost.Filesystem will have direct references
|
||||
:
|
||||
;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user