Rebase to 1.63.0 (#1401431)
This commit is contained in:
parent
eb5a2d18d6
commit
733a71ce66
@ -1,98 +0,0 @@
|
||||
diff -up boost_1_55_0/libs/python/test/exec.cpp\~ boost_1_55_0/libs/python/test/exec.cpp
|
||||
--- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0200
|
||||
+++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +0100
|
||||
@@ -56,6 +56,20 @@ void eval_test()
|
||||
BOOST_TEST(value == "ABCDEFG");
|
||||
}
|
||||
|
||||
+struct PyCtx
|
||||
+{
|
||||
+ PyCtx() {
|
||||
+ Py_Initialize();
|
||||
+ }
|
||||
+
|
||||
+ ~PyCtx() {
|
||||
+ // N.B. certain problems may arise when Py_Finalize is called when
|
||||
+ // using Boost.Python. However in this test suite it all seems to
|
||||
+ // work fine.
|
||||
+ Py_Finalize();
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
void exec_test()
|
||||
{
|
||||
// Register the module with the interpreter
|
||||
@@ -68,6 +82,8 @@ void exec_test()
|
||||
) == -1)
|
||||
throw std::runtime_error("Failed to add embedded_hello to the interpreter's "
|
||||
"builtin modules");
|
||||
+
|
||||
+ PyCtx ctx;
|
||||
// Retrieve the main module
|
||||
python::object main = python::import("__main__");
|
||||
|
||||
@@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=fal
|
||||
}
|
||||
}
|
||||
|
||||
+template <class Cb>
|
||||
+bool
|
||||
+run_and_handle_exception(Cb cb, bool pyerr_expected = false)
|
||||
+{
|
||||
+ PyCtx ctx;
|
||||
+ if (python::handle_exception(cb)) {
|
||||
+ check_pyerr(pyerr_expected);
|
||||
+ return true;
|
||||
+ } else {
|
||||
+ return false;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
BOOST_TEST(argc == 2 || argc == 3);
|
||||
std::string script = argv[1];
|
||||
- // Initialize the interpreter
|
||||
- Py_Initialize();
|
||||
|
||||
- if (python::handle_exception(eval_test)) {
|
||||
- check_pyerr();
|
||||
- }
|
||||
- else if(python::handle_exception(exec_test)) {
|
||||
- check_pyerr();
|
||||
- }
|
||||
- else if (python::handle_exception(boost::bind(exec_file_test, script))) {
|
||||
+ // N.B. exec_test mustn't be called through run_and_handle_exception
|
||||
+ // as it needs to handles the python context by itself.
|
||||
+ if (run_and_handle_exception(eval_test)
|
||||
+ || python::handle_exception(exec_test))
|
||||
check_pyerr();
|
||||
- }
|
||||
-
|
||||
- if (python::handle_exception(exec_test_error))
|
||||
- {
|
||||
- check_pyerr(/*pyerr_expected*/ true);
|
||||
- }
|
||||
else
|
||||
- {
|
||||
+ run_and_handle_exception(boost::bind(exec_file_test, script));
|
||||
+
|
||||
+ if (!run_and_handle_exception(exec_test_error, true))
|
||||
BOOST_ERROR("Python exception expected, but not seen.");
|
||||
- }
|
||||
|
||||
if (argc > 2) {
|
||||
+ PyCtx ctx;
|
||||
// The main purpose is to test compilation. Since this test generates
|
||||
// a file and I (rwgk) am uncertain about the side-effects, run it only
|
||||
// if explicitly requested.
|
||||
exercise_embedding_html();
|
||||
}
|
||||
|
||||
- // Boost.Python doesn't support Py_Finalize yet.
|
||||
- // Py_Finalize();
|
||||
return boost::report_errors();
|
||||
}
|
||||
|
||||
|
||||
Diff finished. Fri Jan 9 21:31:13 2015
|
@ -1,19 +0,0 @@
|
||||
diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
|
||||
--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200
|
||||
+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100
|
||||
@@ -282,12 +282,12 @@ struct grammar_definition
|
||||
#if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
|
||||
typedef impl::grammar_helper_base<GrammarT> helper_base_t;
|
||||
typedef grammar_helper_list<GrammarT> helper_list_t;
|
||||
- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
|
||||
|
||||
helper_list_t& helpers =
|
||||
grammartract_helper_list::do_(self);
|
||||
|
||||
# if defined(BOOST_INTEL_CXX_VERSION)
|
||||
+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
|
||||
for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
|
||||
(*i)->undefine(self);
|
||||
# else
|
||||
|
||||
Diff finished. Tue Jan 20 13:25:53 2015
|
@ -1,32 +0,0 @@
|
||||
commit 2f3b98e640c25fe45ae691a5aa950745380b983e
|
||||
Author: Jonathan Wakely <jwakely@redhat.com>
|
||||
Date: Mon Sep 14 15:05:24 2015 +0100
|
||||
|
||||
Do not qualify <fenv.h> names that might be macros.
|
||||
|
||||
diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp
|
||||
index 3a9e779..8b319df 100644
|
||||
--- a/include/boost/test/impl/execution_monitor.ipp
|
||||
+++ b/include/boost/test/impl/execution_monitor.ipp
|
||||
@@ -1380,8 +1380,8 @@ enable( unsigned mask )
|
||||
|
||||
return ~old_cw & BOOST_FPE_ALL;
|
||||
#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
|
||||
- ::feclearexcept(BOOST_FPE_ALL);
|
||||
- int res = ::feenableexcept( mask );
|
||||
+ feclearexcept(BOOST_FPE_ALL);
|
||||
+ int res = feenableexcept( mask );
|
||||
return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
|
||||
#else
|
||||
/* Not Implemented */
|
||||
@@ -1417,8 +1417,8 @@ disable( unsigned mask )
|
||||
|
||||
return ~old_cw & BOOST_FPE_ALL;
|
||||
#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
|
||||
- ::feclearexcept(BOOST_FPE_ALL);
|
||||
- int res = ::fedisableexcept( mask );
|
||||
+ feclearexcept(BOOST_FPE_ALL);
|
||||
+ int res = fedisableexcept( mask );
|
||||
return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
|
||||
#else
|
||||
/* Not Implemented */
|
@ -1,45 +0,0 @@
|
||||
From 42e7869f411a75512fb6994c634eb086fb9eb5cc Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Kohlhoff <chris@kohlhoff.com>
|
||||
Date: Sun, 11 Sep 2016 12:04:18 +1000
|
||||
Subject: [PATCH] Fix allocator usage to compile with g++ 6.
|
||||
|
||||
---
|
||||
include/boost/asio/impl/use_future.hpp | 16 ++++++++++------
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/include/boost/asio/impl/use_future.hpp b/include/boost/asio/impl/use_future.hpp
|
||||
index b954e14..92106f4 100644
|
||||
--- a/include/boost/asio/impl/use_future.hpp
|
||||
+++ b/include/boost/asio/impl/use_future.hpp
|
||||
@@ -34,10 +34,12 @@ namespace detail {
|
||||
{
|
||||
public:
|
||||
// Construct from use_future special value.
|
||||
- template <typename Allocator>
|
||||
- promise_handler(use_future_t<Allocator> uf)
|
||||
+ template <typename Alloc>
|
||||
+ promise_handler(use_future_t<Alloc> uf)
|
||||
: promise_(std::allocate_shared<std::promise<T> >(
|
||||
- uf.get_allocator(), std::allocator_arg, uf.get_allocator()))
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator()),
|
||||
+ std::allocator_arg,
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator())))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -66,10 +68,12 @@ namespace detail {
|
||||
{
|
||||
public:
|
||||
// Construct from use_future special value. Used during rebinding.
|
||||
- template <typename Allocator>
|
||||
- promise_handler(use_future_t<Allocator> uf)
|
||||
+ template <typename Alloc>
|
||||
+ promise_handler(use_future_t<Alloc> uf)
|
||||
: promise_(std::allocate_shared<std::promise<void> >(
|
||||
- uf.get_allocator(), std::allocator_arg, uf.get_allocator()))
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator()),
|
||||
+ std::allocator_arg,
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator())))
|
||||
{
|
||||
}
|
||||
|
@ -1,37 +0,0 @@
|
||||
commit f9c8f9ec091ad232c0a291904f7839d665d098e0
|
||||
Author: jzmaddock <john@johnmaddock.co.uk>
|
||||
Date: Thu Mar 3 10:52:03 2016 +0000
|
||||
|
||||
Add some needed casts for cases where limb_type is wider than unsigned int.
|
||||
|
||||
diff --git a/include/boost/multiprecision/cpp_int.hpp b/include/boost/multiprecision/cpp_int.hpp
|
||||
index 60ad876..b868167 100644
|
||||
--- a/include/boost/multiprecision/cpp_int.hpp
|
||||
+++ b/include/boost/multiprecision/cpp_int.hpp
|
||||
@@ -190,7 +190,7 @@ private:
|
||||
public:
|
||||
BOOST_STATIC_CONSTANT(unsigned, limb_bits = sizeof(limb_type) * CHAR_BIT);
|
||||
BOOST_STATIC_CONSTANT(limb_type, max_limb_value = ~static_cast<limb_type>(0u));
|
||||
- BOOST_STATIC_CONSTANT(limb_type, sign_bit_mask = 1u << (limb_bits - 1));
|
||||
+ BOOST_STATIC_CONSTANT(limb_type, sign_bit_mask = static_cast<limb_type>(1u) << (limb_bits - 1));
|
||||
BOOST_STATIC_CONSTANT(unsigned, internal_limb_count =
|
||||
MinBits
|
||||
? (MinBits / limb_bits + ((MinBits % limb_bits) ? 1 : 0))
|
||||
@@ -413,7 +413,7 @@ struct cpp_int_base<MinBits, MinBits, signed_magnitude, Checked, void, false>
|
||||
public:
|
||||
BOOST_STATIC_CONSTANT(unsigned, limb_bits = sizeof(limb_type) * CHAR_BIT);
|
||||
BOOST_STATIC_CONSTANT(limb_type, max_limb_value = ~static_cast<limb_type>(0u));
|
||||
- BOOST_STATIC_CONSTANT(limb_type, sign_bit_mask = 1u << (limb_bits - 1));
|
||||
+ BOOST_STATIC_CONSTANT(limb_type, sign_bit_mask = static_cast<limb_type>(1u) << (limb_bits - 1));
|
||||
BOOST_STATIC_CONSTANT(unsigned, internal_limb_count = MinBits / limb_bits + ((MinBits % limb_bits) ? 1 : 0));
|
||||
BOOST_STATIC_CONSTANT(bool, variable = false);
|
||||
BOOST_STATIC_CONSTANT(limb_type, upper_limb_mask = (MinBits % limb_bits) ? (limb_type(1) << (MinBits % limb_bits)) -1 : (~limb_type(0)));
|
||||
@@ -565,7 +565,7 @@ struct cpp_int_base<MinBits, MinBits, unsigned_magnitude, Checked, void, false>
|
||||
public:
|
||||
BOOST_STATIC_CONSTANT(unsigned, limb_bits = sizeof(limb_type) * CHAR_BIT);
|
||||
BOOST_STATIC_CONSTANT(limb_type, max_limb_value = ~static_cast<limb_type>(0u));
|
||||
- BOOST_STATIC_CONSTANT(limb_type, sign_bit_mask = 1u << (limb_bits - 1));
|
||||
+ BOOST_STATIC_CONSTANT(limb_type, sign_bit_mask = static_cast<limb_type>(1u) << (limb_bits - 1));
|
||||
BOOST_STATIC_CONSTANT(unsigned, internal_limb_count = MinBits / limb_bits + ((MinBits % limb_bits) ? 1 : 0));
|
||||
BOOST_STATIC_CONSTANT(bool, variable = false);
|
||||
BOOST_STATIC_CONSTANT(limb_type, upper_limb_mask = (MinBits % limb_bits) ? (limb_type(1) << (MinBits % limb_bits)) -1 : (~limb_type(0)));
|
@ -1,42 +0,0 @@
|
||||
From f2c465ffa508459216f7093bf95ba001ad994206 Mon Sep 17 00:00:00 2001
|
||||
From: vslashg <veloso@verylowsodium.com>
|
||||
Date: Mon, 29 Feb 2016 13:33:35 -0500
|
||||
Subject: [PATCH] Fix auto-pointer registration in Boost Python 1.60.
|
||||
|
||||
The conditional instantiation magic of maybe_register_pointer_to_python() assumes that use_value_holder and use_back_reference will be one of the boost::mpl::bool_ types, but this assumption is no longer true in Boost 1.60, where they can be standard library bool wrappers instead.
|
||||
|
||||
Explicitly defining these types as mpl::bool_ classes fixes https://github.com/boostorg/python/issues/56.
|
||||
---
|
||||
include/boost/python/object/class_metadata.hpp | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/include/boost/python/object/class_metadata.hpp b/include/boost/python/object/class_metadata.hpp
|
||||
index c71cf67..5009c17 100644
|
||||
--- a/include/boost/python/object/class_metadata.hpp
|
||||
+++ b/include/boost/python/object/class_metadata.hpp
|
||||
@@ -164,7 +164,7 @@ struct class_metadata
|
||||
>::type held_type;
|
||||
|
||||
// Determine if the object will be held by value
|
||||
- typedef is_convertible<held_type*,T*> use_value_holder;
|
||||
+ typedef mpl::bool_<is_convertible<held_type*,T*>::value> use_value_holder;
|
||||
|
||||
// Compute the "wrapped type", that is, if held_type is a smart
|
||||
// pointer, we're talking about the pointee.
|
||||
@@ -175,10 +175,12 @@ struct class_metadata
|
||||
>::type wrapped;
|
||||
|
||||
// Determine whether to use a "back-reference holder"
|
||||
- typedef mpl::or_<
|
||||
- has_back_reference<T>
|
||||
- , is_same<held_type_arg,T>
|
||||
- , is_base_and_derived<T,wrapped>
|
||||
+ typedef mpl::bool_<
|
||||
+ mpl::or_<
|
||||
+ has_back_reference<T>
|
||||
+ , is_same<held_type_arg,T>
|
||||
+ , is_base_and_derived<T,wrapped>
|
||||
+ >::value
|
||||
> use_back_reference;
|
||||
|
||||
// Select the holder.
|
114
boost-1.63.0-mpi-getdata.patch
Normal file
114
boost-1.63.0-mpi-getdata.patch
Normal file
@ -0,0 +1,114 @@
|
||||
commit babaa35f51d8b009eba762bc50a5290906b4b0ca
|
||||
Author: Jonathan Wakely <jwakely@redhat.com>
|
||||
Date: Thu Jan 26 20:15:19 2017 +0000
|
||||
|
||||
Replace boost::serialization::detail::get_data function.
|
||||
|
||||
diff --git a/include/boost/mpi/detail/mpi_datatype_primitive.hpp b/include/boost/mpi/detail/mpi_datatype_primitive.hpp
|
||||
index c230055..b95fc38 100644
|
||||
--- a/include/boost/mpi/detail/mpi_datatype_primitive.hpp
|
||||
+++ b/include/boost/mpi/detail/mpi_datatype_primitive.hpp
|
||||
@@ -25,7 +25,6 @@ namespace std{
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/mpl/placeholders.hpp>
|
||||
#include <boost/serialization/array.hpp>
|
||||
-#include <boost/serialization/detail/get_data.hpp>
|
||||
#include <stdexcept>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
@@ -80,18 +79,18 @@ public:
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Type_create_struct,
|
||||
(
|
||||
addresses.size(),
|
||||
- boost::serialization::detail::get_data(lengths),
|
||||
- boost::serialization::detail::get_data(addresses),
|
||||
- boost::serialization::detail::get_data(types),
|
||||
+ get_data(lengths),
|
||||
+ get_data(addresses),
|
||||
+ get_data(types),
|
||||
&datatype_
|
||||
));
|
||||
#else
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Type_struct,
|
||||
(
|
||||
addresses.size(),
|
||||
- boost::serialization::detail::get_data(lengths),
|
||||
- boost::serialization::detail::get_data(addresses),
|
||||
- boost::serialization::detail::get_data(types),
|
||||
+ get_data(lengths),
|
||||
+ get_data(addresses),
|
||||
+ get_data(types),
|
||||
&datatype_
|
||||
));
|
||||
#endif
|
||||
@@ -129,6 +128,12 @@ private:
|
||||
lengths.push_back(l);
|
||||
}
|
||||
|
||||
+ template <class T>
|
||||
+ static T* get_data(std::vector<T>& v)
|
||||
+ {
|
||||
+ return v.empty() ? 0 : &(v[0]);
|
||||
+ }
|
||||
+
|
||||
std::vector<MPI_Aint> addresses;
|
||||
std::vector<MPI_Datatype> types;
|
||||
std::vector<int> lengths;
|
||||
diff --git a/include/boost/mpi/detail/packed_iprimitive.hpp b/include/boost/mpi/detail/packed_iprimitive.hpp
|
||||
index 7080cbf..227dc8e 100644
|
||||
--- a/include/boost/mpi/detail/packed_iprimitive.hpp
|
||||
+++ b/include/boost/mpi/detail/packed_iprimitive.hpp
|
||||
@@ -16,7 +16,6 @@
|
||||
#include <boost/mpi/exception.hpp>
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/serialization/array.hpp>
|
||||
-#include <boost/serialization/detail/get_data.hpp>
|
||||
#include <vector>
|
||||
#include <boost/mpi/allocator.hpp>
|
||||
|
||||
@@ -104,7 +103,12 @@ private:
|
||||
void load_impl(void * p, MPI_Datatype t, int l)
|
||||
{
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Unpack,
|
||||
- (const_cast<char*>(boost::serialization::detail::get_data(buffer_)), buffer_.size(), &position, p, l, t, comm));
|
||||
+ (get_data(buffer_), buffer_.size(), &position, p, l, t, comm));
|
||||
+ }
|
||||
+
|
||||
+ static buffer_type::value_type* get_data(buffer_type& b)
|
||||
+ {
|
||||
+ return b.empty() ? 0 : &(b[0]);
|
||||
}
|
||||
|
||||
buffer_type & buffer_;
|
||||
diff --git a/include/boost/mpi/detail/packed_oprimitive.hpp b/include/boost/mpi/detail/packed_oprimitive.hpp
|
||||
index fbcde9a..3c81a70 100644
|
||||
--- a/include/boost/mpi/detail/packed_oprimitive.hpp
|
||||
+++ b/include/boost/mpi/detail/packed_oprimitive.hpp
|
||||
@@ -15,7 +15,6 @@
|
||||
|
||||
#include <boost/mpi/datatype.hpp>
|
||||
#include <boost/mpi/exception.hpp>
|
||||
-#include <boost/serialization/detail/get_data.hpp>
|
||||
#include <boost/serialization/array.hpp>
|
||||
#include <boost/assert.hpp>
|
||||
#include <vector>
|
||||
@@ -103,13 +102,18 @@ private:
|
||||
|
||||
// pack the data into the buffer
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Pack,
|
||||
- (const_cast<void*>(p), l, t, boost::serialization::detail::get_data(buffer_), buffer_.size(), &position, comm));
|
||||
+ (const_cast<void*>(p), l, t, get_data(buffer_), buffer_.size(), &position, comm));
|
||||
// reduce the buffer size if needed
|
||||
BOOST_ASSERT(std::size_t(position) <= buffer_.size());
|
||||
if (std::size_t(position) < buffer_.size())
|
||||
buffer_.resize(position);
|
||||
}
|
||||
|
||||
+ static buffer_type::value_type* get_data(buffer_type& b)
|
||||
+ {
|
||||
+ return b.empty() ? 0 : &(b[0]);
|
||||
+ }
|
||||
+
|
||||
buffer_type& buffer_;
|
||||
mutable std::size_t size_;
|
||||
MPI_Comm comm;
|
18
boost-1.63.0-mpi-serialize.patch
Normal file
18
boost-1.63.0-mpi-serialize.patch
Normal file
@ -0,0 +1,18 @@
|
||||
commit cfc7c8306a61ed84255973ad93aa4322f86a811a
|
||||
Author: Jonathan Wakely <jwakely@redhat.com>
|
||||
Date: Thu Jan 26 21:52:37 2017 +0000
|
||||
|
||||
Add header for serialization::make_array
|
||||
|
||||
diff --git a/include/boost/mpi/python/serialize.hpp b/include/boost/mpi/python/serialize.hpp
|
||||
index 5f9136b..8933b34 100644
|
||||
--- a/include/boost/mpi/python/serialize.hpp
|
||||
+++ b/include/boost/mpi/python/serialize.hpp
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
#include <boost/serialization/split_free.hpp>
|
||||
#include <boost/serialization/array.hpp>
|
||||
+#include <boost/serialization/array_wrapper.hpp>
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
|
162
boost.spec
162
boost.spec
@ -36,9 +36,9 @@
|
||||
|
||||
Name: boost
|
||||
Summary: The free peer-reviewed portable C++ source libraries
|
||||
Version: 1.60.0
|
||||
%global version_enc 1_60_0
|
||||
Release: 12%{?dist}
|
||||
Version: 1.63.0
|
||||
%global version_enc 1_63_0
|
||||
Release: 1%{?dist}
|
||||
License: Boost and MIT and Python
|
||||
|
||||
%global toplev_dirname %{name}_%{version_enc}
|
||||
@ -64,6 +64,9 @@ Requires: boost-context%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-coroutine%{?_isa} = %{version}-%{release}
|
||||
%endif
|
||||
Requires: boost-date-time%{?_isa} = %{version}-%{release}
|
||||
%if %{with context}
|
||||
Requires: boost-fiber%{?_isa} = %{version}-%{release}
|
||||
%endif
|
||||
Requires: boost-filesystem%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-graph%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-iostreams%{?_isa} = %{version}-%{release}
|
||||
@ -111,16 +114,12 @@ Patch15: boost-1.58.0-pool.patch
|
||||
# https://svn.boost.org/trac/boost/ticket/5637
|
||||
Patch25: boost-1.57.0-mpl-print.patch
|
||||
|
||||
# https://svn.boost.org/trac/boost/ticket/8870
|
||||
Patch36: boost-1.57.0-spirit-unused_typedef.patch
|
||||
|
||||
# https://svn.boost.org/trac/boost/ticket/9038
|
||||
Patch51: boost-1.58.0-pool-test_linking.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1102667
|
||||
Patch61: boost-1.57.0-python-libpython_dep.patch
|
||||
Patch62: boost-1.57.0-python-abi_letters.patch
|
||||
Patch63: boost-1.55.0-python-test-PyImport_AppendInittab.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1190039
|
||||
Patch65: boost-1.57.0-build-optflags.patch
|
||||
@ -128,21 +127,13 @@ Patch65: boost-1.57.0-build-optflags.patch
|
||||
# Prevent gcc.jam from setting -m32 or -m64.
|
||||
Patch68: boost-1.58.0-address-model.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1262444
|
||||
Patch81: boost-1.59-test-fenv.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1318383
|
||||
Patch82: boost-1.60.0-no-rpath.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1349638
|
||||
Patch83: boost-1.60-multiprecision.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1358725
|
||||
# https://github.com/boostorg/python/pull/59/files
|
||||
Patch84: boost-1.60-python-regptr.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1403165
|
||||
Patch85: boost-1.60-asio-use-future.patch
|
||||
# https://github.com/boostorg/mpi/pull/39
|
||||
Patch83: boost-1.63.0-mpi-getdata.patch
|
||||
# https://github.com/boostorg/mpi/pull/40
|
||||
Patch84: boost-1.63.0-mpi-serialize.patch
|
||||
|
||||
%bcond_with tests
|
||||
%bcond_with docs_generated
|
||||
@ -158,27 +149,27 @@ others have been proposed to the C++ Standards Committee for inclusion
|
||||
in future standards.)
|
||||
|
||||
%package atomic
|
||||
Summary: Run-Time component of boost atomic library
|
||||
Summary: Run-time component of boost atomic library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description atomic
|
||||
|
||||
Run-Time support for Boost.Atomic, a library that provides atomic data
|
||||
Run-time support for Boost.Atomic, a library that provides atomic data
|
||||
types and operations on these data types, as well as memory ordering
|
||||
constraints required for coordinating multiple threads through atomic
|
||||
variables.
|
||||
|
||||
%package chrono
|
||||
Summary: Run-Time component of boost chrono library
|
||||
Summary: Run-time component of boost chrono library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-system%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description chrono
|
||||
|
||||
Run-Time support for Boost.Chrono, a set of useful time utilities.
|
||||
Run-time support for Boost.Chrono, a set of useful time utilities.
|
||||
|
||||
%package container
|
||||
Summary: Run-Time component of boost container library
|
||||
Summary: Run-time component of boost container library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description container
|
||||
@ -190,67 +181,78 @@ standard draft features for compilers that comply with C++03.
|
||||
|
||||
%if %{with context}
|
||||
%package context
|
||||
Summary: Run-Time component of boost context switching library
|
||||
Summary: Run-time component of boost context switching library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description context
|
||||
|
||||
Run-Time support for Boost.Context, a foundational library that
|
||||
Run-time support for Boost.Context, a foundational library that
|
||||
provides a sort of cooperative multitasking on a single thread.
|
||||
|
||||
%package coroutine
|
||||
Summary: Run-Time component of boost coroutine library
|
||||
Summary: Run-time component of boost coroutine library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description coroutine
|
||||
Run-Time support for Boost.Coroutine, a library that provides
|
||||
Run-time support for Boost.Coroutine, a library that provides
|
||||
generalized subroutines which allow multiple entry points for
|
||||
suspending and resuming execution.
|
||||
|
||||
%endif
|
||||
|
||||
%package date-time
|
||||
Summary: Run-Time component of boost date-time library
|
||||
Summary: Run-time component of boost date-time library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description date-time
|
||||
|
||||
Run-Time support for Boost Date Time, a set of date-time libraries based
|
||||
Run-time support for Boost Date Time, a set of date-time libraries based
|
||||
on generic programming concepts.
|
||||
|
||||
%if %{with context}
|
||||
%package fiber
|
||||
Summary: Run-time component of boost fiber library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description fiber
|
||||
|
||||
Run-time support for the Boost Fiber library, a framework for
|
||||
micro-/userland-threads (fibers) scheduled cooperatively.
|
||||
%endif
|
||||
|
||||
%package filesystem
|
||||
Summary: Run-Time component of boost filesystem library
|
||||
Summary: Run-time component of boost filesystem library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-system%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description filesystem
|
||||
|
||||
Run-Time support for the Boost Filesystem Library, which provides
|
||||
Run-time support for the Boost Filesystem Library, which provides
|
||||
portable facilities to query and manipulate paths, files, and
|
||||
directories.
|
||||
|
||||
%package graph
|
||||
Summary: Run-Time component of boost graph library
|
||||
Summary: Run-time component of boost graph library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-regex%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description graph
|
||||
|
||||
Run-Time support for the BGL graph library. BGL interface and graph
|
||||
Run-time support for the BGL graph library. BGL interface and graph
|
||||
components are generic, in the same sense as the the Standard Template
|
||||
Library (STL).
|
||||
|
||||
%package iostreams
|
||||
Summary: Run-Time component of boost iostreams library
|
||||
Summary: Run-time component of boost iostreams library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description iostreams
|
||||
|
||||
Run-Time support for Boost.IOStreams, a framework for defining streams,
|
||||
Run-time support for Boost.IOStreams, a framework for defining streams,
|
||||
stream buffers and i/o filters.
|
||||
|
||||
%package locale
|
||||
Summary: Run-Time component of boost locale library
|
||||
Summary: Run-time component of boost locale library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-chrono%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-system%{?_isa} = %{version}-%{release}
|
||||
@ -258,11 +260,11 @@ Requires: boost-thread%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description locale
|
||||
|
||||
Run-Time support for Boost.Locale, a set of localization and Unicode
|
||||
Run-time support for Boost.Locale, a set of localization and Unicode
|
||||
handling tools.
|
||||
|
||||
%package log
|
||||
Summary: Run-Time component of boost logging library
|
||||
Summary: Run-time component of boost logging library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description log
|
||||
@ -280,21 +282,21 @@ Requires: libquadmath%{?_isa}
|
||||
|
||||
%description math
|
||||
|
||||
Run-Time support for C99 and C++ TR1 C-style Functions from the math
|
||||
Run-time support for C99 and C++ TR1 C-style Functions from the math
|
||||
portion of Boost.TR1.
|
||||
|
||||
%package program-options
|
||||
Summary: Run-Time component of boost program_options library
|
||||
Summary: Run-time component of boost program_options library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description program-options
|
||||
|
||||
Run-Time support of boost program options library, which allows program
|
||||
Run-time support of boost program options library, which allows program
|
||||
developers to obtain (name, value) pairs from the user, via
|
||||
conventional methods such as command-line and configuration file.
|
||||
|
||||
%package python
|
||||
Summary: Run-Time component of boost python library
|
||||
Summary: Run-time component of boost python library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description python
|
||||
@ -308,7 +310,7 @@ support for Boost Python Library.
|
||||
%if %{with python3}
|
||||
|
||||
%package python3
|
||||
Summary: Run-Time component of boost python library for Python 3
|
||||
Summary: Run-time component of boost python library for Python 3
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description python3
|
||||
@ -332,69 +334,69 @@ Shared object symbolic links for Python 3 variant of Boost.Python.
|
||||
%endif
|
||||
|
||||
%package random
|
||||
Summary: Run-Time component of boost random library
|
||||
Summary: Run-time component of boost random library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description random
|
||||
|
||||
Run-Time support for boost random library.
|
||||
Run-time support for boost random library.
|
||||
|
||||
%package regex
|
||||
Summary: Run-Time component of boost regular expression library
|
||||
Summary: Run-time component of boost regular expression library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description regex
|
||||
|
||||
Run-Time support for boost regular expression library.
|
||||
Run-time support for boost regular expression library.
|
||||
|
||||
%package serialization
|
||||
Summary: Run-Time component of boost serialization library
|
||||
Summary: Run-time component of boost serialization library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description serialization
|
||||
|
||||
Run-Time support for serialization for persistence and marshaling.
|
||||
Run-time support for serialization for persistence and marshaling.
|
||||
|
||||
%package signals
|
||||
Summary: Run-Time component of boost signals and slots library
|
||||
Summary: Run-time component of boost signals and slots library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description signals
|
||||
|
||||
Run-Time support for managed signals & slots callback implementation.
|
||||
Run-time support for managed signals & slots callback implementation.
|
||||
|
||||
%package system
|
||||
Summary: Run-Time component of boost system support library
|
||||
Summary: Run-time component of boost system support library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description system
|
||||
|
||||
Run-Time component of Boost operating system support library, including
|
||||
Run-time component of Boost operating system support library, including
|
||||
the diagnostics support that is part of the C++11 standard library.
|
||||
|
||||
%package test
|
||||
Summary: Run-Time component of boost test library
|
||||
Summary: Run-time component of boost test library
|
||||
Group: System Environment/Libraries
|
||||
|
||||
%description test
|
||||
|
||||
Run-Time support for simple program testing, full unit testing, and for
|
||||
Run-time support for simple program testing, full unit testing, and for
|
||||
program execution monitoring.
|
||||
|
||||
%package thread
|
||||
Summary: Run-Time component of boost thread library
|
||||
Summary: Run-time component of boost thread library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-system%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description thread
|
||||
|
||||
Run-Time component Boost.Thread library, which provides classes and
|
||||
Run-time component Boost.Thread library, which provides classes and
|
||||
functions for managing multiple threads of execution, and for
|
||||
synchronizing data between the threads or providing separate copies of
|
||||
data specific to individual threads.
|
||||
|
||||
%package timer
|
||||
Summary: Run-Time component of boost timer library
|
||||
Summary: Run-time component of boost timer library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-chrono%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-system%{?_isa} = %{version}-%{release}
|
||||
@ -406,7 +408,7 @@ The Boost Timer library answers that question and does so portably,
|
||||
with as little as one #include and one additional line of code.
|
||||
|
||||
%package type_erasure
|
||||
Summary: Run-Time component of boost type erasure library
|
||||
Summary: Run-time component of boost type erasure library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-chrono%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-system%{?_isa} = %{version}-%{release}
|
||||
@ -417,7 +419,7 @@ The Boost.TypeErasure library provides runtime polymorphism in C++
|
||||
that is more flexible than that provided by the core language.
|
||||
|
||||
%package wave
|
||||
Summary: Run-Time component of boost C99/C++ pre-processing library
|
||||
Summary: Run-time component of boost C99/C++ pre-processing library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-chrono%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-date-time%{?_isa} = %{version}-%{release}
|
||||
@ -427,7 +429,7 @@ Requires: boost-thread%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description wave
|
||||
|
||||
Run-Time support for the Boost.Wave library, a Standards conforming,
|
||||
Run-time support for the Boost.Wave library, a Standards conforming,
|
||||
and highly configurable implementation of the mandated C99/C++
|
||||
pre-processor functionality.
|
||||
|
||||
@ -494,14 +496,14 @@ This package contains example source files distributed with boost.
|
||||
%if %{with openmpi}
|
||||
|
||||
%package openmpi
|
||||
Summary: Run-Time component of Boost.MPI library
|
||||
Summary: Run-time component of Boost.MPI library
|
||||
Group: System Environment/Libraries
|
||||
BuildRequires: openmpi-devel
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description openmpi
|
||||
|
||||
Run-Time support for Boost.MPI-OpenMPI, a library providing a clean C++
|
||||
Run-time support for Boost.MPI-OpenMPI, a library providing a clean C++
|
||||
API over the OpenMPI implementation of MPI.
|
||||
|
||||
%package openmpi-devel
|
||||
@ -530,14 +532,14 @@ Python support for Boost.MPI-OpenMPI, a library providing a clean C++
|
||||
API over the OpenMPI implementation of MPI.
|
||||
|
||||
%package graph-openmpi
|
||||
Summary: Run-Time component of parallel boost graph library
|
||||
Summary: Run-time component of parallel boost graph library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-openmpi%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description graph-openmpi
|
||||
|
||||
Run-Time support for the Parallel BGL graph library. The interface and
|
||||
Run-time support for the Parallel BGL graph library. The interface and
|
||||
graph components are generic, in the same sense as the the Standard
|
||||
Template Library (STL). This libraries in this package use OpenMPI
|
||||
back-end to do the parallel work.
|
||||
@ -548,7 +550,7 @@ back-end to do the parallel work.
|
||||
%if %{with mpich}
|
||||
|
||||
%package mpich
|
||||
Summary: Run-Time component of Boost.MPI library
|
||||
Summary: Run-time component of Boost.MPI library
|
||||
Group: System Environment/Libraries
|
||||
BuildRequires: mpich-devel
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
@ -557,7 +559,7 @@ Obsoletes: boost-mpich2 < 1.53.0-9
|
||||
|
||||
%description mpich
|
||||
|
||||
Run-Time support for Boost.MPI-MPICH, a library providing a clean C++
|
||||
Run-time support for Boost.MPI-MPICH, a library providing a clean C++
|
||||
API over the MPICH implementation of MPI.
|
||||
|
||||
%package mpich-devel
|
||||
@ -590,7 +592,7 @@ Python support for Boost.MPI-MPICH, a library providing a clean C++
|
||||
API over the MPICH implementation of MPI.
|
||||
|
||||
%package graph-mpich
|
||||
Summary: Run-Time component of parallel boost graph library
|
||||
Summary: Run-time component of parallel boost graph library
|
||||
Group: System Environment/Libraries
|
||||
Requires: boost-mpich%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
@ -599,7 +601,7 @@ Obsoletes: boost-graph-mpich2 < 1.53.0-9
|
||||
|
||||
%description graph-mpich
|
||||
|
||||
Run-Time support for the Parallel BGL graph library. The interface and
|
||||
Run-time support for the Parallel BGL graph library. The interface and
|
||||
graph components are generic, in the same sense as the the Standard
|
||||
Template Library (STL). This libraries in this package use MPICH
|
||||
back-end to do the parallel work.
|
||||
@ -646,18 +648,14 @@ a number of significant features and is now developed independently
|
||||
%patch5 -p1
|
||||
%patch15 -p0
|
||||
%patch25 -p1
|
||||
%patch36 -p1
|
||||
%patch51 -p1
|
||||
%patch61 -p1
|
||||
%patch62 -p1
|
||||
%patch63 -p1
|
||||
%patch65 -p1
|
||||
%patch68 -p1
|
||||
%patch81 -p2
|
||||
%patch82 -p0
|
||||
%patch83 -p2
|
||||
%patch84 -p2
|
||||
%patch85 -p2
|
||||
|
||||
# At least python2_version needs to be a macro so that it's visible in
|
||||
# %%install as well.
|
||||
@ -954,6 +952,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%postun date-time -p /sbin/ldconfig
|
||||
|
||||
%post fiber -p /sbin/ldconfig
|
||||
|
||||
%postun fiber -p /sbin/ldconfig
|
||||
|
||||
%post filesystem -p /sbin/ldconfig
|
||||
|
||||
%postun filesystem -p /sbin/ldconfig
|
||||
@ -1083,6 +1085,12 @@ fi
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_date_time.so.%{sonamever}
|
||||
|
||||
%if %{with context}
|
||||
%files fiber
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_fiber.so.%{sonamever}
|
||||
%endif
|
||||
|
||||
%files filesystem
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_filesystem.so.%{sonamever}
|
||||
@ -1190,6 +1198,9 @@ fi
|
||||
%{_libdir}/libboost_coroutine.so
|
||||
%endif
|
||||
%{_libdir}/libboost_date_time.so
|
||||
%if %{with context}
|
||||
%{_libdir}/libboost_fiber.so
|
||||
%endif
|
||||
%{_libdir}/libboost_filesystem.so
|
||||
%{_libdir}/libboost_graph.so
|
||||
%{_libdir}/libboost_iostreams.so
|
||||
@ -1286,6 +1297,9 @@ fi
|
||||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 26 2017 Jonathan Wakely <jwakely@redhat.com> - 1.63.0-1
|
||||
- Rebase to 1.63.0 (#1401431)
|
||||
|
||||
* Tue Dec 20 2016 Miro Hrončok <mhroncok@redhat.com> - 1.60.0-12
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user