diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/auto_buffer-C-20-compatibility.patch b/auto_buffer-C-20-compatibility.patch new file mode 100644 index 0000000..6e4a95c --- /dev/null +++ b/auto_buffer-C-20-compatibility.patch @@ -0,0 +1,34 @@ +From 675ea3ddf714e2594393ed935f64dce99721b7d7 Mon Sep 17 00:00:00 2001 +From: Avi Kivity +Date: Tue, 12 May 2020 14:29:56 +0300 +Subject: [PATCH] auto_buffer: C++20 compatibility + +C++20's std::allocator does not define the pointer member type, +use std::allocator_traits instead. +--- + include/boost/signals2/detail/auto_buffer.hpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/boost/signals2/detail/auto_buffer.hpp b/include/boost/signals2/detail/auto_buffer.hpp +index 5ff8dd2..ed62152 100644 +--- a/include/boost/signals2/detail/auto_buffer.hpp ++++ b/include/boost/signals2/detail/auto_buffer.hpp +@@ -140,11 +140,15 @@ namespace detail + typedef Allocator allocator_type; + typedef T value_type; + typedef typename Allocator::size_type size_type; + typedef typename Allocator::difference_type difference_type; + typedef T* pointer; ++#if __cplusplus <= 201703L + typedef typename Allocator::pointer allocator_pointer; ++#else ++ typedef typename std::allocator_traits::pointer allocator_pointer; ++#endif + typedef const T* const_pointer; + typedef T& reference; + typedef const T& const_reference; + typedef pointer iterator; + typedef const_pointer const_iterator; +-- +2.26.2 + diff --git a/b2.1 b/b2.1 deleted file mode 100644 index 130814b..0000000 --- a/b2.1 +++ /dev/null @@ -1,144 +0,0 @@ -.TH "b2" 1 "Sat Nov 19 2011" "Doxygen" \" -*- nroff -*- -.ad l -.nh -.SH NAME -b2 \- Command-line utility to build Boost-related C++ projects with Boost\&.Build -.SH "SYNOPSIS" -.PP -\fBb2\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP -.PP -\fIb2\fP accepts the following options: -.PP -\fB-a\fP -.br - Build all targets, even if they are current -.PP -\fB-dx\fP -.br - Set the debug level to x (0-9) -.PP -\fB-fx\fP -.br - Read x instead of Jambase -.PP -\fB-jx\fP -.br - Run up to x shell commands concurrently -.PP -\fB-lx\fP -.br - Limit actions to x number of seconds after which they are stopped -.PP -\fB-n\fP -.br - Don't actually execute the updating actions -.PP -\fB-ox\fP -.br - Write the updating actions to file x -.PP -\fB-px\fP -.br - x=0, pipes action stdout and stderr merged into action output -.PP -\fB-q\fP -.br - Quit quickly as soon as a target fails -.PP -\fB-sx=y\fP -.br - Set variable x=y, overriding environment -.PP -\fB-tx\fP -.br - Rebuild x, even if it is up-to-date -.PP -\fB-v\fP -.br - Print the version of b2 and exit -.PP -\fB--x\fP -.br - Option is ignored -.SH "DESCRIPTION" -.PP -This section provides the information necessary to create your own projects using \fIBoost\&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help) -.PP -\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a build engine with its own interpreted language, and \fIBoost\&.Build\fP itself, implemented in \fIBoost\&.Jam's\fP language\&. The chain of events when you type b2 on the command line is as follows: -.IP "\(bu" 2 -\fIBoost\&.Jam\fP tries to find \fIBoost\&.Build\fP and loads the top-level module\&. The exact process is described in the section called “Initialization” -.PP -.PP -.IP "\(bu" 2 -The top-level module loads user-defined configuration files, \fIuser-config\&.jam\fP and \fIsite-config\&.jam\fP, which define available toolsets -.PP -.PP -.IP "\(bu" 2 -The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles\&. As a result, a tree of projects is created, with targets inside projects -.PP -.PP -.IP "\(bu" 2 -Finally, using the build request specified on the command line, \fIBoost\&.Build\fP decides which targets should be built and how\&. That information is passed back to \fIBoost\&.Jam\fP, which takes care of actually running the scheduled build action commands -.PP -.PP -So, to be able to successfully use \fIBoost\&.Build\fP, you need to know only four things: -.IP "\(bu" 2 -How to configure \fIBoost\&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html) -.IP "\(bu" 2 -How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html) -.IP "\(bu" 2 -How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html) -.PP -.PP -Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called “Boost\&.Jam Language” (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html) -.SH "CONCEPTS" -.PP -\fIBoost\&.Build\fP has a few unique concepts that are introduced in this section\&. The best way to explain the concepts is by comparison with more classical build tools -.PP -When using any flavour of make, you directly specify targets and commands that are used to create them from other target\&. The below example creates a\&.o from a\&.c using a hardcoded compiler invocation command -.PP -a\&.o: a\&.c -.br - g++ -o a\&.o -g a\&.c -.PP -This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system\&. -.PP -To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files\&. Consider this example: -.PP -add_program ('a', 'a\&.c') -.br -.PP -This is a function call that creates targets necessary to create executable file from source file a\&.c\&. Depending on configured properties, different commands line may be used\&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds\&. Often, change in any build property requires complete reconfiguration of the build tree -.PP -In order to support true multivariant builds, Boost\&.Build introduces the concept of metatarget—object that is created when build description is parsed and can be later called with specific build properties to generate actual targets -.PP -Consider an example: -.PP -exe a : a\&.cpp ; -.br -.PP -When this declaration is parsed, \fIBoost\&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used\&. After all build files are parsed, Boost\&.Build considers properties requested on the command line\&. Supposed you have invoked \fIBoost\&.Build\fP with: -.PP -\fIb2\fP toolset=gcc toolset=msvc -.br -.PP -In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc\&. Both invocations will produce concrete targets, that will have different extensions and use different command lines\&. Another key concept is build property\&. Build property is a variable that affects the build process\&. It can be specified on the command line, and is passed when calling a metatarget -.PP -While all build tools have a similar mechanism, \fIBoost\&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics -.PP -The final concept is property propagation\&. Boost\&.Build does not require that every metatarget is called with the same properties\&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called “Requirements”: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.overview.targets.requirements) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own\&. -.PP -For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost\&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)\&. -.SH "SEE ALSO" -.PP -\fBboost-libraries\fP(3) -.SH "SUPPORT" -.PP -Please report any bugs to https://svn.boost.org/trac/boost/ -.SH "COPYRIGHT" -.PP -Boost Software License - Version 1\&.0 - August 17th, 2003 -.PP -See the LICENSE_1_0\&.txt file for more information on that license, or directly on Internet: -.br - http://www.boost.org/LICENSE_1_0.txt diff --git a/boost-1.48.0-add-bjam-man-page.patch b/boost-1.48.0-add-bjam-man-page.patch new file mode 100644 index 0000000..ea3f19f --- /dev/null +++ b/boost-1.48.0-add-bjam-man-page.patch @@ -0,0 +1,150 @@ +diff --git a/tools/build/v2/doc/bjam.1 b/tools/build/v2/doc/bjam.1 +new file mode 100644 +index 0000000..8a44af6 +--- /dev/null ++++ b/tools/build/v2/doc/bjam.1 +@@ -0,0 +1,144 @@ ++.TH "bjam" 1 "Sat Nov 19 2011" "Doxygen" \" -*- nroff -*- ++.ad l ++.nh ++.SH NAME ++bjam \- Command-line utility to build Boost-related C++ projects with Boost\&.Build ++.SH "SYNOPSIS" ++.PP ++\fBbjam\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP ++.PP ++\fIbjam\fP accepts the following options: ++.PP ++\fB-a\fP ++.br ++ Build all targets, even if they are current ++.PP ++\fB-dx\fP ++.br ++ Set the debug level to x (0-9) ++.PP ++\fB-fx\fP ++.br ++ Read x instead of Jambase ++.PP ++\fB-jx\fP ++.br ++ Run up to x shell commands concurrently ++.PP ++\fB-lx\fP ++.br ++ Limit actions to x number of seconds after which they are stopped ++.PP ++\fB-n\fP ++.br ++ Don't actually execute the updating actions ++.PP ++\fB-ox\fP ++.br ++ Write the updating actions to file x ++.PP ++\fB-px\fP ++.br ++ x=0, pipes action stdout and stderr merged into action output ++.PP ++\fB-q\fP ++.br ++ Quit quickly as soon as a target fails ++.PP ++\fB-sx=y\fP ++.br ++ Set variable x=y, overriding environment ++.PP ++\fB-tx\fP ++.br ++ Rebuild x, even if it is up-to-date ++.PP ++\fB-v\fP ++.br ++ Print the version of jam and exit ++.PP ++\fB--x\fP ++.br ++ Option is ignored ++.SH "DESCRIPTION" ++.PP ++This section provides the information necessary to create your own projects using \fIBoost\&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help) ++.PP ++\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a build engine with its own interpreted language, and \fIBoost\&.Build\fP itself, implemented in \fIBoost\&.Jam's\fP language\&. The chain of events when you type bjam on the command line is as follows: ++.IP "\(bu" 2 ++\fIBoost\&.Jam\fP tries to find \fIBoost\&.Build\fP and loads the top-level module\&. The exact process is described in the section called “Initialization” ++.PP ++.PP ++.IP "\(bu" 2 ++The top-level module loads user-defined configuration files, \fIuser-config\&.jam\fP and \fIsite-config\&.jam\fP, which define available toolsets ++.PP ++.PP ++.IP "\(bu" 2 ++The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles\&. As a result, a tree of projects is created, with targets inside projects ++.PP ++.PP ++.IP "\(bu" 2 ++Finally, using the build request specified on the command line, \fIBoost\&.Build\fP decides which targets should be built and how\&. That information is passed back to \fIBoost\&.Jam\fP, which takes care of actually running the scheduled build action commands ++.PP ++.PP ++So, to be able to successfully use \fIBoost\&.Build\fP, you need to know only four things: ++.IP "\(bu" 2 ++How to configure \fIBoost\&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html) ++.IP "\(bu" 2 ++How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html) ++.IP "\(bu" 2 ++How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html) ++.PP ++.PP ++Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called “Boost\&.Jam Language” (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html) ++.SH "CONCEPTS" ++.PP ++\fIBoost\&.Build\fP has a few unique concepts that are introduced in this section\&. The best way to explain the concepts is by comparison with more classical build tools ++.PP ++When using any flavour of make, you directly specify targets and commands that are used to create them from other target\&. The below example creates a\&.o from a\&.c using a hardcoded compiler invocation command ++.PP ++a\&.o: a\&.c ++.br ++ g++ -o a\&.o -g a\&.c ++.PP ++This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system\&. ++.PP ++To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files\&. Consider this example: ++.PP ++add_program ('a', 'a\&.c') ++.br ++.PP ++This is a function call that creates targets necessary to create executable file from source file a\&.c\&. Depending on configured properties, different commands line may be used\&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds\&. Often, change in any build property requires complete reconfiguration of the build tree ++.PP ++In order to support true multivariant builds, Boost\&.Build introduces the concept of metatarget—object that is created when build description is parsed and can be later called with specific build properties to generate actual targets ++.PP ++Consider an example: ++.PP ++exe a : a\&.cpp ; ++.br ++.PP ++When this declaration is parsed, \fIBoost\&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used\&. After all build files are parsed, Boost\&.Build considers properties requested on the command line\&. Supposed you have invoked \fIBoost\&.Build\fP with: ++.PP ++\fIbjam\fP toolset=gcc toolset=msvc ++.br ++.PP ++In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc\&. Both invocations will produce concrete targets, that will have different extensions and use different command lines\&. Another key concept is build property\&. Build property is a variable that affects the build process\&. It can be specified on the command line, and is passed when calling a metatarget ++.PP ++While all build tools have a similar mechanism, \fIBoost\&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics ++.PP ++The final concept is property propagation\&. Boost\&.Build does not require that every metatarget is called with the same properties\&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called “Requirements”: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.overview.targets.requirements) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own\&. ++.PP ++For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost\&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)\&. ++.SH "SEE ALSO" ++.PP ++\fBboost-libraries\fP(3) ++.SH "SUPPORT" ++.PP ++Please report any bugs to https://svn.boost.org/trac/boost/ ++.SH "COPYRIGHT" ++.PP ++Boost Software License - Version 1\&.0 - August 17th, 2003 ++.PP ++See the LICENSE_1_0\&.txt file for more information on that license, or directly on Internet: ++.br ++ http://www.boost.org/LICENSE_1_0.txt diff --git a/boost-1.50.0-fix-non-utf8-files.patch b/boost-1.50.0-fix-non-utf8-files.patch new file mode 100644 index 0000000..469b35d --- /dev/null +++ b/boost-1.50.0-fix-non-utf8-files.patch @@ -0,0 +1,22 @@ +diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp +index 8b2bc43..d04f2fe 100644 +--- a/libs/units/example/autoprefixes.cpp ++++ b/libs/units/example/autoprefixes.cpp +@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit + { + static constexpr const char* name() { return("EUR"); } +- static constexpr const char* symbol() { return(""); } ++ static constexpr const char* symbol() { return("€"); } + }; + + int main() +@@ -140,7 +140,7 @@ int main() + + quantity ce = 2048. * euro_base_unit::unit_type(); + cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR +- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k ++ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ + + + return 0; diff --git a/boost-1.50.0-foreach.patch b/boost-1.50.0-foreach.patch new file mode 100644 index 0000000..dc8cd71 --- /dev/null +++ b/boost-1.50.0-foreach.patch @@ -0,0 +1,60 @@ +Index: /trunk/boost/foreach_fwd.hpp +=================================================================== +--- /trunk/boost/foreach_fwd.hpp (revision 62661) ++++ /trunk/boost/foreach_fwd.hpp (revision 75540) +@@ -15,4 +15,6 @@ + #define BOOST_FOREACH_FWD_HPP + ++#include // for std::pair ++ + // This must be at global scope, hence the uglified name + enum boost_foreach_argument_dependent_lookup_hack +@@ -26,4 +28,7 @@ + namespace foreach + { ++ template ++ std::pair in_range(T begin, T end); ++ + /////////////////////////////////////////////////////////////////////////////// + // boost::foreach::tag +@@ -47,4 +52,22 @@ + } // namespace foreach + ++// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131 ++namespace BOOST_FOREACH ++{ ++ using foreach::in_range; ++ using foreach::tag; ++ ++ template ++ struct is_lightweight_proxy ++ : foreach::is_lightweight_proxy ++ {}; ++ ++ template ++ struct is_noncopyable ++ : foreach::is_noncopyable ++ {}; ++ ++} // namespace BOOST_FOREACH ++ + } // namespace boost + +Index: /trunk/boost/foreach.hpp +=================================================================== +--- /trunk/boost/foreach.hpp (revision 75077) ++++ /trunk/boost/foreach.hpp (revision 75540) +@@ -166,5 +166,5 @@ + // at the global namespace for your type. + template +-inline boost::foreach::is_lightweight_proxy * ++inline boost::BOOST_FOREACH::is_lightweight_proxy * + boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } + +@@ -191,5 +191,5 @@ + // at the global namespace for your type. + template +-inline boost::foreach::is_noncopyable * ++inline boost::BOOST_FOREACH::is_noncopyable * + boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } + diff --git a/boost-1.53.0-fpclassify-unused_typedef.patch b/boost-1.53.0-fpclassify-unused_typedef.patch new file mode 100644 index 0000000..dddd3a8 --- /dev/null +++ b/boost-1.53.0-fpclassify-unused_typedef.patch @@ -0,0 +1,80 @@ +diff -up boost_1_53_0/boost/math/special_functions/sign.hpp\~ boost_1_53_0/boost/math/special_functions/sign.hpp +--- boost_1_53_0/boost/math/special_functions/sign.hpp~ 2011-05-17 14:19:17.000000000 +0200 ++++ boost_1_53_0/boost/math/special_functions/sign.hpp 2013-07-22 23:24:39.751342557 +0200 +@@ -110,7 +110,6 @@ template int (signbit)(T x) + { + typedef typename detail::fp_traits::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point::type fp_tag; + return detail::signbit_impl(x, method()); + } + +@@ -124,7 +123,6 @@ template T (changesign)(const T + { //!< \brief return unchanged binary pattern of x, except for change of sign bit. + typedef typename detail::fp_traits::sign_change_type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point::type fp_tag; + + return detail::changesign_impl(x, method()); + } +diff -up boost_1_53_0/boost/math/special_functions/fpclassify.hpp~ boost_1_53_0/boost/math/special_functions/fpclassify.hpp +--- boost_1_53_0/boost/math/special_functions/fpclassify.hpp~ 2012-12-12 19:17:22.000000000 +0100 ++++ boost_1_53_0/boost/math/special_functions/fpclassify.hpp 2013-07-22 12:07:59.478713488 +0200 +@@ -327,7 +327,6 @@ inline bool (isfinite)(T x) + { //!< \brief return true if floating-point type t is finite. + typedef typename detail::fp_traits::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point::type fp_tag; + typedef typename tools::promote_args::type value_type; + return detail::isfinite_impl(static_cast(x), method()); + } +@@ -338,7 +338,6 @@ inline bool (isfinite)(long double x) + { //!< \brief return true if floating-point type t is finite. + typedef detail::fp_traits::type traits; + typedef traits::method method; +- typedef boost::is_floating_point::type fp_tag; + typedef long double value_type; + return detail::isfinite_impl(static_cast(x), method()); + } +@@ -398,7 +397,6 @@ inline bool (isnormal)(T x) + { + typedef typename detail::fp_traits::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point::type fp_tag; + typedef typename tools::promote_args::type value_type; + return detail::isnormal_impl(static_cast(x), method()); + } +@@ -409,7 +408,6 @@ inline bool (isnormal)(long double x) + { + typedef detail::fp_traits::type traits; + typedef traits::method method; +- typedef boost::is_floating_point::type fp_tag; + typedef long double value_type; + return detail::isnormal_impl(static_cast(x), method()); + } +@@ -487,7 +485,6 @@ inline bool (isinf)(T x) + { + typedef typename detail::fp_traits::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point::type fp_tag; + typedef typename tools::promote_args::type value_type; + return detail::isinf_impl(static_cast(x), method()); + } +@@ -498,7 +496,6 @@ inline bool (isinf)(long double x) + { + typedef detail::fp_traits::type traits; + typedef traits::method method; +- typedef boost::is_floating_point::type fp_tag; + typedef long double value_type; + return detail::isinf_impl(static_cast(x), method()); + } +@@ -570,7 +567,6 @@ inline bool (isnan)(T x) + { //!< \brief return true if floating-point type t is NaN (Not A Number). + typedef typename detail::fp_traits::type traits; + typedef typename traits::method method; +- typedef typename boost::is_floating_point::type fp_tag; + return detail::isnan_impl(x, method()); + } + + +Diff finished. Mon Jul 22 12:09:24 2013 diff --git a/boost-1.53.0-graph-unused_typedef.patch b/boost-1.53.0-graph-unused_typedef.patch new file mode 100644 index 0000000..697714f --- /dev/null +++ b/boost-1.53.0-graph-unused_typedef.patch @@ -0,0 +1,130 @@ +diff -urp boost_1_54_0-orig/boost/graph/breadth_first_search.hpp boost_1_54_0/boost/graph/breadth_first_search.hpp +--- boost_1_54_0-orig/boost/graph/breadth_first_search.hpp 2013-07-23 00:47:43.418886551 +0200 ++++ boost_1_54_0/boost/graph/breadth_first_search.hpp 2013-07-23 00:50:40.339958756 +0200 +@@ -64,7 +64,6 @@ namespace boost { + BOOST_CONCEPT_ASSERT(( IncidenceGraphConcept )); + typedef graph_traits GTraits; + typedef typename GTraits::vertex_descriptor Vertex; +- typedef typename GTraits::edge_descriptor Edge; + BOOST_CONCEPT_ASSERT(( BFSVisitorConcept )); + BOOST_CONCEPT_ASSERT(( ReadWritePropertyMapConcept )); + typedef typename property_traits::value_type ColorValue; +diff -urp boost_1_53_0-orig/boost/graph/compressed_sparse_row_graph.hpp boost_1_53_0/boost/graph/compressed_sparse_row_graph.hpp +--- boost_1_53_0-orig/boost/graph/compressed_sparse_row_graph.hpp 2013-07-23 01:32:19.273266030 +0200 ++++ boost_1_53_0/boost/graph/compressed_sparse_row_graph.hpp 2013-07-23 01:34:15.202970721 +0200 +@@ -642,8 +642,6 @@ class compressed_sparse_row_graph::vertex_descriptor vertex_t; +- typedef typename boost::graph_traits::vertices_size_type vertex_num; +- typedef typename boost::graph_traits::edges_size_type edge_num; + typedef std::vector > edge_vector_t; + edge_vector_t new_edges(first, last); + if (new_edges.empty()) return; +@@ -666,8 +664,6 @@ class compressed_sparse_row_graph::vertex_descriptor vertex_t; +- typedef typename boost::graph_traits::vertices_size_type vertex_num; +- typedef typename boost::graph_traits::edges_size_type edge_num; + typedef std::pair vertex_pair; + typedef std::vector< + boost::tuple + in_edges(Vertex v, const BOOST_BIDIR_CSR_GRAPH_TYPE& g) + { +- typedef typename BOOST_BIDIR_CSR_GRAPH_TYPE::edge_descriptor ed; + typedef typename BOOST_BIDIR_CSR_GRAPH_TYPE::in_edge_iterator it; + EdgeIndex v_row_start = g.m_backward.m_rowstart[v]; + EdgeIndex next_row_start = g.m_backward.m_rowstart[v + 1]; +@@ -1368,7 +1363,6 @@ put(Tag tag, + typename property_map::key_type k, + typename lookup_one_property::plist_type, Tag>::type val) { + typedef typename property_map::all_tag all_tag; +- typedef typename property_map::type outer_pm; + lookup_one_property::plist_type, Tag>::lookup(get(all_tag(), g, k), tag) = val; + } + +diff -urp boost_1_53_0-orig/boost/graph/detail/adjacency_list.hpp boost_1_53_0/boost/graph/detail/adjacency_list.hpp +--- boost_1_53_0-orig/boost/graph/detail/adjacency_list.hpp 2013-07-23 01:32:19.390266741 +0200 ++++ boost_1_53_0/boost/graph/detail/adjacency_list.hpp 2013-07-23 01:34:15.275971164 +0200 +@@ -634,7 +634,6 @@ namespace boost { + directed_graph_helper& g_) + { + typedef typename Config::graph_type graph_type; +- typedef typename Config::edge_parallel_category Cat; + graph_type& g = static_cast(g_); + g.out_edge_list(u).clear(); + // clear() should be a req of Sequence and AssociativeContainer, +@@ -781,7 +780,6 @@ namespace boost { + typedef typename Graph::global_edgelist_selector EdgeListS; + BOOST_STATIC_ASSERT((!is_same::value)); + +- typedef typename EdgeList::value_type StoredEdge; + typename EdgeList::iterator i = el.begin(), end = el.end(); + for (; i != end; ++i) { + if ((*i).get_target() == v) { +@@ -986,7 +984,6 @@ namespace boost { + BOOST_STATIC_ASSERT((!is_same::value)); + + typedef typename Config::graph_type graph_type; +- typedef typename Config::edge_parallel_category Cat; + graph_type& g = static_cast(g_); + while (true) { + typename Config::out_edge_iterator ei, ei_end; +@@ -1588,7 +1585,6 @@ namespace boost { + typedef typename Config::graph_type Graph; + typedef typename Config::StoredEdge StoredEdge; + const Graph& cg = static_cast(g_); +- typedef typename Config::out_edge_iterator out_edge_iterator; + const typename Config::OutEdgeList& el = cg.out_edge_list(u); + typename Config::OutEdgeList::const_iterator it = graph_detail:: + find(el, StoredEdge(v)); +diff -urp boost_1_53_0-orig/boost/graph/detail/compressed_sparse_row_struct.hpp boost_1_53_0/boost/graph/detail/compressed_sparse_row_struct.hpp +--- boost_1_53_0-orig/boost/graph/detail/compressed_sparse_row_struct.hpp 2013-07-23 01:32:19.395266772 +0200 ++++ boost_1_53_0/boost/graph/detail/compressed_sparse_row_struct.hpp 2013-07-23 01:34:15.278971182 +0200 +@@ -218,8 +218,6 @@ namespace detail { + // the user has supplied the number of edges. + edges_size_type numedges = numedges_or_zero; + if (numedges == 0) { +- typedef typename std::iterator_traits::iterator_category +- category; + numedges = boost::graph::detail::reserve_count_for_single_pass(edge_begin, edge_end); + } + m_column.clear(); +@@ -313,7 +311,6 @@ namespace detail { + inherited_edge_properties::resize(numedges); + EdgeIndex current_edge = 0; + typedef typename boost::graph_traits::vertex_descriptor g_vertex; +- typedef typename boost::graph_traits::edge_descriptor g_edge; + typedef typename boost::graph_traits::out_edge_iterator + g_out_edge_iter; + +@@ -347,7 +344,6 @@ namespace detail { + // Flip sequence + BidirectionalIterator first(last_sorted); + BidirectionalIterator last(first_sorted); +- typedef Vertex vertex_t; + typedef Vertex vertex_num; + typedef EdgeIndex edge_num; + edge_num new_edge_count = std::distance(first, last); +diff -urp boost_1_53_0-orig/boost/graph/detail/histogram_sort.hpp boost_1_53_0/boost/graph/detail/histogram_sort.hpp +--- boost_1_53_0-orig/boost/graph/detail/histogram_sort.hpp 2013-07-23 01:32:19.364266583 +0200 ++++ boost_1_53_0/boost/graph/detail/histogram_sort.hpp 2013-07-23 01:34:15.279971188 +0200 +@@ -159,7 +159,6 @@ histogram_sort_inplace(KeyIterator key_b + Value1Iter values1, + KeyTransform key_transform) { + +- typedef NumKeys vertices_size_type; + typedef typename std::iterator_traits::value_type EdgeIndex; + + // 1. Copy m_rowstart (except last element) to get insert positions +@@ -194,7 +193,6 @@ histogram_sort_inplace(KeyIterator key_b + Value2Iter values2, + KeyTransform key_transform) { + +- typedef NumKeys vertices_size_type; + typedef typename std::iterator_traits::value_type EdgeIndex; + + // 1. Copy m_rowstart (except last element) to get insert positions diff --git a/boost-1.53.0-lexical_cast-unused_typedef.patch b/boost-1.53.0-lexical_cast-unused_typedef.patch new file mode 100644 index 0000000..a93c0ee --- /dev/null +++ b/boost-1.53.0-lexical_cast-unused_typedef.patch @@ -0,0 +1,13 @@ +diff -up boost_1_53_0/boost/lexical_cast.hpp\~ boost_1_53_0/boost/lexical_cast.hpp +--- boost_1_53_0/boost/lexical_cast.hpp~ 2012-12-29 15:41:23.000000000 +0100 ++++ boost_1_53_0/boost/lexical_cast.hpp 2013-07-22 23:27:48.841566845 +0200 +@@ -865,7 +865,6 @@ namespace boost { + #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS + BOOST_STATIC_ASSERT(!std::numeric_limits::is_signed); + #endif +- typedef typename Traits::int_type int_type; + CharT const czero = lcast_char_constants::zero; + --end; + value = 0; + +Diff finished. Mon Jul 22 23:28:02 2013 diff --git a/boost-1.53.0-math-unused_typedef-3.patch b/boost-1.53.0-math-unused_typedef-3.patch new file mode 100644 index 0000000..f8b4854 --- /dev/null +++ b/boost-1.53.0-math-unused_typedef-3.patch @@ -0,0 +1,46 @@ +diff -urp boost_1_53_0-orig/boost/math/special_functions/detail/igamma_inverse.hpp boost_1_53_0/boost/math/special_functions/detail/igamma_inverse.hpp +--- boost_1_53_0-orig/boost/math/special_functions/detail/igamma_inverse.hpp 2013-07-23 01:32:21.874281840 +0200 ++++ boost_1_53_0/boost/math/special_functions/detail/igamma_inverse.hpp 2013-07-23 01:34:15.291971260 +0200 +@@ -341,7 +341,6 @@ struct gamma_p_inverse_func + // flag is set, then Q(x) - q and it's derivatives. + // + typedef typename policies::evaluation::type value_type; +- typedef typename lanczos::lanczos::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float, +diff -urp boost_1_53_0-orig/boost/math/special_functions/gamma.hpp boost_1_53_0/boost/math/special_functions/gamma.hpp +--- boost_1_53_0-orig/boost/math/special_functions/gamma.hpp 2013-07-23 01:32:21.824281537 +0200 ++++ boost_1_53_0/boost/math/special_functions/gamma.hpp 2013-07-23 01:34:15.322971451 +0200 +@@ -1360,7 +1360,6 @@ inline typename tools::promote_args::type result_type; + typedef typename policies::evaluation::type value_type; +- typedef typename lanczos::lanczos::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float, +@@ -1489,7 +1488,6 @@ inline typename tools::promote_args::type result_type; + typedef typename policies::evaluation::type value_type; +- typedef typename lanczos::lanczos::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float, +@@ -1520,7 +1518,6 @@ inline typename tools::promote_args::type result_type; + typedef typename policies::evaluation::type value_type; +- typedef typename lanczos::lanczos::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float, +@@ -1551,7 +1548,6 @@ inline typename tools::promote_args::type result_type; + typedef typename policies::evaluation::type value_type; +- typedef typename lanczos::lanczos::type evaluation_type; + typedef typename policies::normalise< + Policy, + policies::promote_float, diff --git a/boost-1.53.0-regex-unused_typedef.patch b/boost-1.53.0-regex-unused_typedef.patch new file mode 100644 index 0000000..d10b476 --- /dev/null +++ b/boost-1.53.0-regex-unused_typedef.patch @@ -0,0 +1,65 @@ +diff -up ./boost/regex/icu.hpp~ ./boost/regex/icu.hpp +--- ./boost/regex/icu.hpp~ 2011-10-16 14:19:37.000000000 +0200 ++++ ./boost/regex/icu.hpp 2013-07-22 23:32:44.346321967 +0200 +@@ -423,7 +423,6 @@ bool do_regex_match(BidiIterator first, + { + typedef u16_to_u32_iterator conv_type; + typedef match_results match_type; +- typedef typename match_type::allocator_type alloc_type; + match_type what; + bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags); + // copy results across to m: +@@ -439,7 +438,6 @@ bool do_regex_match(BidiIterator first, + { + typedef u8_to_u32_iterator conv_type; + typedef match_results match_type; +- typedef typename match_type::allocator_type alloc_type; + match_type what; + bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags); + // copy results across to m: +@@ -598,7 +596,6 @@ bool do_regex_search(BidiIterator first, + { + typedef u16_to_u32_iterator conv_type; + typedef match_results match_type; +- typedef typename match_type::allocator_type alloc_type; + match_type what; + bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base)); + // copy results across to m: +@@ -615,7 +612,6 @@ bool do_regex_search(BidiIterator first, + { + typedef u8_to_u32_iterator conv_type; + typedef match_results match_type; +- typedef typename match_type::allocator_type alloc_type; + match_type what; + bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base)); + // copy results across to m: +diff -up ./boost/regex/v4/regex_format.hpp~ ./boost/regex/v4/regex_format.hpp +--- ./boost/regex/v4/regex_format.hpp~ 2012-05-24 12:03:48.000000000 +0200 ++++ ./boost/regex/v4/regex_format.hpp 2013-07-22 23:31:06.466740621 +0200 +@@ -1064,7 +1064,6 @@ struct format_functor_c_string + template + OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits()) + { +- typedef typename Match::char_type char_type; + const charT* end = func; + while(*end) ++end; + return regex_format_imp(i, m, func, end, f, t); +@@ -1083,7 +1082,6 @@ struct format_functor_container + template + OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits()) + { +- typedef typename Match::char_type char_type; + return re_detail::regex_format_imp(i, m, func.begin(), func.end(), f, t); + } + private: +diff -up ./boost/regex/v4/regex_split.hpp~ ./boost/regex/v4/regex_split.hpp +--- ./boost/regex/v4/regex_split.hpp~ 2007-11-25 19:07:19.000000000 +0100 ++++ ./boost/regex/v4/regex_split.hpp 2013-07-22 23:31:29.098875039 +0200 +@@ -107,7 +107,6 @@ std::size_t regex_split(OutputIterator o + std::size_t max_split) + { + typedef typename std::basic_string::const_iterator ci_t; +- typedef typename match_results::allocator_type match_allocator; + ci_t last = s.begin(); + std::size_t init_size = max_split; + re_detail::split_pred pred(&last, &out, &max_split); diff --git a/boost-1.53.0-static_assert-unused_typedef.patch b/boost-1.53.0-static_assert-unused_typedef.patch new file mode 100644 index 0000000..c4157d1 --- /dev/null +++ b/boost-1.53.0-static_assert-unused_typedef.patch @@ -0,0 +1,30 @@ +diff -up boost_1_53_0/boost/static_assert.hpp\~ boost_1_53_0/boost/static_assert.hpp +--- boost_1_53_0/boost/static_assert.hpp~ 2012-12-11 15:42:26.000000000 +0100 ++++ boost_1_53_0/boost/static_assert.hpp 2013-07-19 14:15:59.504039071 +0200 +@@ -43,6 +43,14 @@ + #else + # define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x) + #endif ++// ++// If the compiler warns about unused typedefs then enable this: ++// ++#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))) ++# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused)) ++#else ++# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE ++#endif + + #ifndef BOOST_NO_CXX11_STATIC_ASSERT + # define BOOST_STATIC_ASSERT( B ) static_assert(B, #B) +@@ -122,7 +130,8 @@ template struct static_assert_tes + #define BOOST_STATIC_ASSERT( B ) \ + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >)>\ +- BOOST_JOIN(boost_static_assert_typedef_, __LINE__) ++ BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \ ++ BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE + #endif + + #else + +Diff finished. Fri Jul 19 14:16:04 2013 diff --git a/boost-1.53.0-thread-unused_typedef.patch b/boost-1.53.0-thread-unused_typedef.patch new file mode 100644 index 0000000..3fd12c2 --- /dev/null +++ b/boost-1.53.0-thread-unused_typedef.patch @@ -0,0 +1,26 @@ +diff -up boost_1_53_0/boost/thread/future.hpp\~ boost_1_53_0/boost/thread/future.hpp +--- boost_1_53_0/boost/thread/future.hpp~ 2012-12-16 20:01:45.000000000 +0100 ++++ boost_1_53_0/boost/thread/future.hpp 2013-07-23 16:50:27.044995968 +0200 +@@ -2911,10 +2913,6 @@ namespace boost + { + typedef typename boost::result_of::type()>::type R; + typedef packaged_task packaged_task_type; +- +- typedef detail::async_func::type> BF; +- typedef typename BF::result_type Rp; +- + #endif + #else + template +@@ -2925,9 +2924,6 @@ namespace boost + { + typedef typename boost::result_of::type()>::type R; + typedef packaged_task packaged_task_type; +- +- typedef detail::async_func::type> BF; +- typedef typename BF::result_type Rp; + #endif + + if (int(policy) & int(launch::async)) + +Diff finished. Tue Jul 23 16:50:30 2013 diff --git a/boost-1.54.0-locale-unused_typedef.patch b/boost-1.54.0-locale-unused_typedef.patch new file mode 100644 index 0000000..b7c9128 --- /dev/null +++ b/boost-1.54.0-locale-unused_typedef.patch @@ -0,0 +1,11 @@ +diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp +--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 ++++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 +@@ -27,7 +27,6 @@ namespace boundary { + int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) + { + typedef LeftIterator left_iterator; +- typedef RightIterator right_iterator; + typedef typename std::iterator_traits::value_type char_type; + typedef std::char_traits traits; + while(l_begin!=l_end && r_begin!=r_end) { diff --git a/boost-1.54.0-random-unused_typedef.patch b/boost-1.54.0-random-unused_typedef.patch new file mode 100644 index 0000000..fff4226 --- /dev/null +++ b/boost-1.54.0-random-unused_typedef.patch @@ -0,0 +1,24 @@ +Index: boost/random/generate_canonical.hpp +=================================================================== +--- boost/random/generate_canonical.hpp (revision 85073) ++++ boost/random/generate_canonical.hpp (working copy) +@@ -54,7 +54,6 @@ + using std::floor; + BOOST_ASSERT((g.min)() == 0); + BOOST_ASSERT((g.max)() == 1); +- typedef typename URNG::result_type base_result; + std::size_t digits = std::numeric_limits::digits; + std::size_t engine_bits = detail::generator_bits::value(); + std::size_t b = (std::min)(bits, digits); +Index: boost/random/uniform_real_distribution.hpp +=================================================================== +--- boost/random/uniform_real_distribution.hpp (revision 85073) ++++ boost/random/uniform_real_distribution.hpp (working copy) +@@ -36,7 +36,6 @@ + { + for(;;) { + typedef T result_type; +- typedef typename Engine::result_type base_result; + result_type numerator = static_cast(eng() - (eng.min)()); + result_type divisor = static_cast((eng.max)() - (eng.min)()); + BOOST_ASSERT(divisor > 0); diff --git a/boost-1.57.0-mpl-print.patch b/boost-1.57.0-mpl-print.patch new file mode 100644 index 0000000..561cef1 --- /dev/null +++ b/boost-1.57.0-mpl-print.patch @@ -0,0 +1,31 @@ +diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp +--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 ++++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +@@ -52,16 +52,15 @@ struct print + enum { n = sizeof(T) + -1 }; + #elif defined(__MWERKS__) + void f(int); +-#else +- enum { +- n = +-# if defined(__EDG_VERSION__) +- aux::dependent_unsigned::value > -1 +-# else +- sizeof(T) > -1 +-# endif +- }; +-#endif ++#elif defined(__EDG_VERSION__) ++ enum { n = aux::dependent_unsigned::value > -1 }; ++#elif defined(BOOST_GCC) ++ enum { n1 }; ++ enum { n2 }; ++ enum { n = n1 != n2 }; ++#else ++ enum { n = sizeof(T) > -1 }; ++#endif + }; + + #if defined(BOOST_MSVC) + +Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/boost-1.57.0-python-libpython_dep.patch b/boost-1.57.0-python-libpython_dep.patch new file mode 100644 index 0000000..57bfc26 --- /dev/null +++ b/boost-1.57.0-python-libpython_dep.patch @@ -0,0 +1,13 @@ +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-1.58.0-pool-test_linking.patch b/boost-1.58.0-pool-test_linking.patch new file mode 100644 index 0000000..b57e6d0 --- /dev/null +++ b/boost-1.58.0-pool-test_linking.patch @@ -0,0 +1,30 @@ +--- boost_1_68_0/libs/pool/test/Jamfile.v2.orig 2018-08-01 20:50:52.000000000 +0000 ++++ boost_1_68_0/libs/pool/test/Jamfile.v2 2018-12-01 17:29:33.322195409 +0000 +@@ -22,18 +22,18 @@ + import testing ; + + test-suite pool : +- [ run test_simple_seg_storage.cpp : : : msvc:-wd4267 ] +- [ run test_pool_alloc.cpp ] +- [ run pool_msvc_compiler_bug_test.cpp : : : msvc:-wd4512 ] +- [ run test_msvc_mem_leak_detect.cpp ] +- [ run test_bug_3349.cpp ] +- [ run test_bug_4960.cpp ] ++ [ run test_simple_seg_storage.cpp : : : msvc:-wd4267 /boost/system//boost_system ] ++ [ run test_pool_alloc.cpp : : : /boost/system//boost_system ] ++ [ run pool_msvc_compiler_bug_test.cpp : : : msvc:-wd4512 /boost/system//boost_system ] ++ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] + [ run test_bug_1252.cpp : : : + clang:-Wno-c++11-long-long + gcc:-Wno-long-long +- pathscale:-Wno-long-long ] +- [ run test_bug_2696.cpp ] +- [ run test_bug_5526.cpp ] ++ pathscale:-Wno-long-long /boost/system//boost_system ] ++ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] + [ run test_threading.cpp : : : multi /boost/thread//boost_thread ] + [ compile test_poisoned_macros.cpp ] + ; diff --git a/boost-1.58.0-pool.patch b/boost-1.58.0-pool.patch new file mode 100644 index 0000000..ed8449e --- /dev/null +++ b/boost-1.58.0-pool.patch @@ -0,0 +1,120 @@ +Index: boost/pool/pool.hpp +=================================================================== +--- boost/pool/pool.hpp (revision 78317) ++++ boost/pool/pool.hpp (revision 78326) +@@ -27,4 +27,6 @@ + #include + ++// std::numeric_limits ++#include + // boost::integer::static_lcm + #include +@@ -358,4 +360,11 @@ + } + ++ size_type max_chunks() const ++ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. ++ size_type partition_size = alloc_size(); ++ size_type POD_size = integer::static_lcm::value + sizeof(size_type); ++ return (std::numeric_limits::max() - POD_size) / alloc_size(); ++ } ++ + static void * & nextof(void * const ptr) + { //! \returns Pointer dereferenced. +@@ -377,5 +388,7 @@ + //! the first time that object needs to allocate system memory. + //! The default is 32. This parameter may not be 0. +- //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ //! \param nmax_size is the maximum number of chunks to allocate in one block. ++ set_next_size(nnext_size); ++ set_max_size(nmax_size); + } + +@@ -400,7 +413,7 @@ + } + void set_next_size(const size_type nnext_size) +- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. +- //! \returns nnext_size. +- next_size = start_size = nnext_size; ++ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. ++ BOOST_USING_STD_MIN(); ++ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); + } + size_type get_max_size() const +@@ -410,5 +423,6 @@ + void set_max_size(const size_type nmax_size) + { //! Set max_size. +- max_size = nmax_size; ++ BOOST_USING_STD_MIN(); ++ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); + } + size_type get_requested_size() const +@@ -713,7 +727,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -753,7 +767,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // initialize it, +@@ -797,4 +811,6 @@ + //! \returns Address of chunk n if allocated ok. + //! \returns 0 if not enough memory for n chunks. ++ if (n > max_chunks()) ++ return 0; + + const size_type partition_size = alloc_size(); +@@ -845,7 +861,7 @@ + BOOST_USING_STD_MIN(); + if(!max_size) +- next_size <<= 1; ++ set_next_size(next_size << 1); + else if( next_size*partition_size/requested_size < max_size) +- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); ++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); + + // insert it into the list, +Index: libs/pool/test/test_bug_6701.cpp +=================================================================== +--- libs/pool/test/test_bug_6701.cpp (revision 78326) ++++ libs/pool/test/test_bug_6701.cpp (revision 78326) +@@ -0,0 +1,27 @@ ++/* Copyright (C) 2012 Étienne Dupuis ++* ++* Use, modification and distribution is subject to the ++* Boost Software License, Version 1.0. (See accompanying ++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) ++ ++#include ++#include ++ ++int main() ++{ ++ boost::pool<> p(1024, std::numeric_limits::max() / 768); ++ ++ void *x = p.malloc(); ++ BOOST_ASSERT(!x); ++ ++ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); ++ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); ++ ++ void *y = p.ordered_malloc(std::numeric_limits::max() / 768); ++ BOOST_ASSERT(!y); ++ ++ return 0; ++} diff --git a/boost-1.63.0-dual-python-build-v2.patch b/boost-1.63.0-dual-python-build-v2.patch new file mode 100644 index 0000000..2baf69c --- /dev/null +++ b/boost-1.63.0-dual-python-build-v2.patch @@ -0,0 +1,87 @@ +--- boost_1_63_0/libs/mpi/build/Jamfile.v2 2016-12-22 06:33:17.000000000 -0600 ++++ boost_1_63_0/libs/mpi/build/Jamfile.v2 2017-05-19 01:45:05.485563800 -0500 +@@ -11,6 +11,7 @@ + import mpi ; + import indirect ; + import python ; ++import feature ; + + libraries = ; + +@@ -53,18 +54,38 @@ lib boost_mpi + ../../serialization/build//boost_serialization + /mpi//mpi [ mpi.extra-requirements ] + ; ++ ++rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } + + libraries += boost_mpi ; ++rule find-py3-version ++{ ++ local versions = [ feature.values python ] ; ++ local py3ver ; ++ for local v in $(versions) ++ { ++ if $(v) >= 3.0 ++ { ++ py3ver = $(v) ; ++ } ++ } ++ return $(py3ver) ; ++} ++ ++py3-version = [ find-py3-version ] ; + + if [ python.configured ] + { +- lib boost_mpi_python ++ ++ rule lib_boost_mpi_python ( is-py3 ? ) { ++ ++ lib [ cond $(is-py3) : boost_mpi_python3 : boost_mpi_python ] + : # Sources + python/serialize.cpp + : # Requirements + boost_mpi + /mpi//mpi [ mpi.extra-requirements ] +- /boost/python//boost_python ++ [ cond $(is-py3) : /boost/python//boost_python3 : /boost/python//boost_python ] + shared:BOOST_MPI_DYN_LINK=1 + shared:BOOST_MPI_PYTHON_DYN_LINK=1 + shared:BOOST_PYTHON_DYN_LINK=1 +@@ -76,7 +97,6 @@ libraries += boost_mpi ; + : # Usage requirements + /mpi//mpi [ mpi.extra-requirements ] + ; +- libraries += boost_mpi_python ; + + python-extension mpi + : # Sources +@@ -93,8 +113,8 @@ libraries += boost_mpi ; + python/status.cpp + python/py_timer.cpp + : # Requirements +- /boost/python//boost_python +- boost_mpi_python ++ [ cond $(is-py3) : /boost/python//boost_python3 : /boost/python//boost_python ] ++ [ cond $(is-py3) : boost_mpi_python3 : boost_mpi_python ] + boost_mpi + /mpi//mpi [ mpi.extra-requirements ] + shared:BOOST_MPI_DYN_LINK=1 +@@ -102,6 +122,16 @@ libraries += boost_mpi ; + shared:BOOST_PYTHON_DYN_LINK=1 + shared shared + ; ++ } ++ ++ if $(py3-version) { ++ lib_boost_mpi_python yes ; ++ libraries += boost_mpi_python3 ; ++ } else { ++ lib_boost_mpi_python ; ++ libraries += boost_mpi_python ; ++ } ++ + } + } + else if ! ( --without-mpi in [ modules.peek : ARGV ] ) diff --git a/boost-1.66.0-bjam-build-flags.patch b/boost-1.66.0-bjam-build-flags.patch new file mode 100644 index 0000000..34ee6ca --- /dev/null +++ b/boost-1.66.0-bjam-build-flags.patch @@ -0,0 +1,26 @@ +--- boost_1_66_0/tools/build/src/engine/build.jam~ 2018-02-07 21:36:14.552201421 +0000 ++++ boost_1_66_0/tools/build/src/engine/build.jam 2018-02-07 21:36:29.014173266 +0000 +@@ -4,7 +4,7 @@ + #~ http://www.boost.org/LICENSE_1_0.txt) + + # Clean env vars of any "extra" empty values. +-for local v in ARGV CC CFLAGS LIBS ++for local v in ARGV CC CFLAGS LIBS RPM_OPT_FLAGS RPM_LD_FLAGS + { + local values ; + for local x in $($(v)) +@@ -215,12 +215,12 @@ + : -L$(--python-lib[1]) -l$(--python-lib[2]) ; + ## GCC 2.x, 3.x, 4.x + toolset gcc gcc : "-o " : -D +- : -pedantic -fno-strict-aliasing ++ : -pedantic -fno-strict-aliasing $(RPM_OPT_FLAGS) + [ opt --release : [ opt --symbols : -g : -s ] -O3 ] + [ opt --debug : -g -O0 -fno-inline ] + [ opt --profile : -O3 -g -pg ] + -I$(--python-include) -I$(--extra-include) -Wno-long-long +- : -L$(--python-lib[1]) -l$(--python-lib[2]) ; ++ : -L$(--python-lib[1]) -l$(--python-lib[2]) $(RPM_LD_FLAGS) ; + ## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll + toolset gcc-nocygwin gcc : "-o " : -D + : -s -O3 -mno-cygwin diff --git a/boost-1.66.0-build-optflags.patch b/boost-1.66.0-build-optflags.patch new file mode 100644 index 0000000..8855b40 --- /dev/null +++ b/boost-1.66.0-build-optflags.patch @@ -0,0 +1,49 @@ +--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2017-12-13 23:56:50.000000000 +0000 ++++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 12:48:26.264755316 +0000 +@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc + + actions compile.c++ bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" + } + + actions compile.c bind PCH_FILE +@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE + + actions compile.c++.preprocess bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" + } + + actions compile.c.preprocess bind PCH_FILE +@@ -755,17 +755,17 @@ actions compile.c.pch + ### + + # Declare flags and action for compilation. +-toolset.flags gcc.compile OPTIONS off : -O0 ; +-toolset.flags gcc.compile OPTIONS speed : -O3 ; +-toolset.flags gcc.compile OPTIONS space : -Os ; +- +-toolset.flags gcc.compile OPTIONS off : -fno-inline ; +-toolset.flags gcc.compile OPTIONS on : -Wno-inline ; +-toolset.flags gcc.compile OPTIONS full : -finline-functions -Wno-inline ; +- +-toolset.flags gcc.compile OPTIONS off : -w ; +-toolset.flags gcc.compile OPTIONS on : -Wall ; +-toolset.flags gcc.compile OPTIONS all : -Wall -pedantic ; ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS speed : ; ++toolset.flags gcc.compile OPTIONS space : ; ++ ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS on : ; ++toolset.flags gcc.compile OPTIONS full : ; ++ ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS on : ; ++toolset.flags gcc.compile OPTIONS all : ; + toolset.flags gcc.compile OPTIONS on : -Werror ; + + toolset.flags gcc.compile OPTIONS on : -g ; diff --git a/boost-1.66.0-no-rpath.patch b/boost-1.66.0-no-rpath.patch new file mode 100644 index 0000000..e69e0b4 --- /dev/null +++ b/boost-1.66.0-no-rpath.patch @@ -0,0 +1,20 @@ +--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:23:45.361330881 +0000 ++++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:23:45.362330880 +0000 +@@ -1191,7 +1191,7 @@ rule link ( targets * : sources * : prop + + actions link bind LIBRARIES + { +- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) ++ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + rule link.dll ( targets * : sources * : properties * ) +@@ -1204,7 +1204,7 @@ rule link.dll ( targets * : sources * : + # Differs from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) ++ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + ### diff --git a/boost-1.66.0-python-abi_letters.patch b/boost-1.66.0-python-abi_letters.patch new file mode 100644 index 0000000..a421a75 --- /dev/null +++ b/boost-1.66.0-python-abi_letters.patch @@ -0,0 +1,62 @@ +--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 ++++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 +@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti + # using python : 2.3 : /usr/local/bin/python ; + # + rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? +- : condition * : extension-suffix ? ) ++ : condition * : extension-suffix ? : abi-letters ? ) + { + project.push-current $(.project) ; + +@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ? + } + } + +- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; ++ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ; + + project.pop-current ; + } +@@ -653,7 +653,7 @@ local rule system-library-dependencies ( + + # Declare a target to represent Python's library. + # +-local rule declare-libpython-target ( version ? : requirements * ) ++local rule declare-libpython-target ( version ? : requirements * : abi-letters ? ) + { + # Compute the representation of Python version in the name of Python's + # library file. +@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve + } + + # Declare it. +- lib python.lib : : python$(lib-version) $(requirements) ; ++ lib python.lib : : python$(lib-version)$(abi-letters) $(requirements) ; + } + + + # Implementation of init. + local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : +- condition * : extension-suffix ? ) ++ condition * : extension-suffix ? : abi-letters ? ) + { + local prefix ; + local exec-prefix ; +@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o + extension-suffix ?= _d ; + } + extension-suffix ?= "" ; ++ abi-letters ?= "" ; + + local cmds-to-try ; + +@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o + } + else + { +- declare-libpython-target $(version) : $(target-requirements) ; ++ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ; + + # This is an evil hack. On, Windows, when Python is embedded, nothing + # seems to set up sys.path to include Python's standard library diff --git a/boost-1.69-format-allocator.patch b/boost-1.69-format-allocator.patch new file mode 100644 index 0000000..28c43a8 --- /dev/null +++ b/boost-1.69-format-allocator.patch @@ -0,0 +1,28 @@ +--- boost_1_69_0/boost/format/alt_sstream_impl.hpp~ 2020-03-30 15:20:18.565658757 +0100 ++++ boost_1_69_0/boost/format/alt_sstream_impl.hpp 2020-03-30 15:20:33.768636162 +0100 +@@ -40,8 +40,11 @@ + #ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC + void *vd_ptr = alloc_.allocate(sz, is_allocated_? eback() : 0); + Ch *new_ptr = static_cast(vd_ptr); +-#else ++#elif defined BOOST_NO_CXX11_ALLOCATOR + Ch *new_ptr = alloc_.allocate(sz, is_allocated_? eback() : 0); ++#else ++ Ch *new_ptr = std::allocator_traits::allocate(alloc_, ++ sz, is_allocated_? eback() : 0); + #endif + // if this didnt throw, we're safe, update the buffer + dealloc(); +@@ -257,8 +260,11 @@ + #ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC + void *vdptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0); + newptr = static_cast(vdptr); +-#else ++#elif defined BOOST_NO_CXX11_ALLOCATOR + newptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0); ++#else ++ newptr = std::allocator_traits::allocate(alloc_, ++ new_size, is_allocated_? oldptr : 0); + #endif + } + diff --git a/boost-1.69-mpi-c_data.patch b/boost-1.69-mpi-c_data.patch new file mode 100644 index 0000000..857cca2 --- /dev/null +++ b/boost-1.69-mpi-c_data.patch @@ -0,0 +1,27 @@ +From dc708430bf5fd31d29da2e7e6b5fd20fe593e106 Mon Sep 17 00:00:00 2001 +From: Michael Kuron +Date: Thu, 14 Feb 2019 15:55:31 +0100 +Subject: [PATCH] mpi::detail::c_data needs to check for empty vectors + +If the standard library is configured to do range checks (-D _GLIBCXX_ASSERTIONS), accessing the zeroth element of a vector to get its address triggers an assertion. +--- + include/boost/mpi/detail/antiques.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/boost/mpi/detail/antiques.hpp b/include/boost/mpi/detail/antiques.hpp +index 0bd235b2..93b8efe9 100644 +--- a/include/boost/mpi/detail/antiques.hpp ++++ b/include/boost/mpi/detail/antiques.hpp +@@ -19,10 +19,10 @@ namespace detail { + // serve as an incentive to get rid of this when those compilers + // are dropped. + template +- T* c_data(std::vector& v) { return &(v[0]); } ++ T* c_data(std::vector& v) { if (v.empty()) return NULL; return &(v[0]); } + + template +- T const* c_data(std::vector const& v) { return &(v[0]); } ++ T const* c_data(std::vector const& v) { if (v.empty()) return NULL; return &(v[0]); } + + // Some old MPI implementation (OpenMPI 1.6 for example) have non + // conforming API w.r.t. constness. diff --git a/boost-1.69-random.patch b/boost-1.69-random.patch new file mode 100644 index 0000000..0a1d286 --- /dev/null +++ b/boost-1.69-random.patch @@ -0,0 +1,22 @@ +From 1be44d405e48a42a63bd8d2dae739560b486a55c Mon Sep 17 00:00:00 2001 +From: Nick Thompson +Date: Sun, 11 Feb 2018 15:02:43 -0600 +Subject: [PATCH] [ci skip] Remove deprecated header. + +--- + include/boost/random/detail/integer_log2.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/random/detail/integer_log2.hpp b/include/boost/random/detail/integer_log2.hpp +index 248243a4b..2e49f281f 100644 +--- a/include/boost/random/detail/integer_log2.hpp ++++ b/include/boost/random/detail/integer_log2.hpp +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + + namespace boost { + namespace random { diff --git a/boost-1.69.0-test-cxx20.patch b/boost-1.69.0-test-cxx20.patch new file mode 100644 index 0000000..c9b0e67 --- /dev/null +++ b/boost-1.69.0-test-cxx20.patch @@ -0,0 +1,50 @@ +From 8ac88c62dcc809d42daf8b6bef10f7adecc46dd1 Mon Sep 17 00:00:00 2001 +From: Laurent Stacul +Date: Mon, 17 Feb 2020 08:57:49 +0000 +Subject: [PATCH] Fix compilation issue due to deleted + std::basic_ostream::operator<< overload + +--- + include/boost/test/impl/test_tools.ipp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/test/impl/test_tools.ipp b/include/boost/test/impl/test_tools.ipp +index 40f24e6399..e4d61660b8 100644 +--- a/include/boost/test/impl/test_tools.ipp ++++ b/include/boost/test/impl/test_tools.ipp +@@ -124,7 +124,7 @@ print_log_value::operator()( std::ostream& ostr, char const* t ) + void + print_log_value::operator()( std::ostream& ostr, wchar_t const* t ) + { +- ostr << ( t ? t : L"null string" ); ++ ostr << ( t ? reinterpret_cast(t) : "null string" ); + } + + //____________________________________________________________________________// +From db6b98c72783351e0acd3c558691323a7a103ba9 Mon Sep 17 00:00:00 2001 +From: Raffi Enficiaud +Date: Sat, 9 May 2020 10:42:38 +0200 +Subject: [PATCH] Fixing cast issue when logging wchar_t + +--- + include/boost/test/impl/test_tools.ipp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/include/boost/test/impl/test_tools.ipp b/include/boost/test/impl/test_tools.ipp +index 025cd1a92a..bbee21fbbc 100644 +--- a/include/boost/test/impl/test_tools.ipp ++++ b/include/boost/test/impl/test_tools.ipp +@@ -124,7 +124,12 @@ print_log_value::operator()( std::ostream& ostr, char const* t ) + void + print_log_value::operator()( std::ostream& ostr, wchar_t const* t ) + { +- ostr << ( t ? reinterpret_cast(t) : "null string" ); ++ if(t) { ++ ostr << static_cast(t); ++ } ++ else { ++ ostr << "null w-string"; ++ } + } + + //____________________________________________________________________________// diff --git a/boost-1.73.0-cmakedir.patch b/boost-1.73.0-cmakedir.patch deleted file mode 100644 index e47728f..0000000 --- a/boost-1.73.0-cmakedir.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- boost_1_73_0/tools/boost_install/boost-install.jam~ 2020-04-24 20:21:50.330267122 +0100 -+++ boost_1_73_0/tools/boost_install/boost-install.jam 2020-04-24 20:22:16.818360540 +0100 -@@ -652,25 +652,6 @@ - "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" - : true ; - -- if [ path.is-rooted $(cmakedir) ] -- { -- local cmakedir-native = [ path-native-fwd $(cmakedir) ] ; -- -- print.text -- -- "" -- "# If the computed and the original directories are symlink-equivalent, use original" -- "if(EXISTS \"$(cmakedir-native)\")" -- " get_filename_component(_BOOST_CMAKEDIR_ORIGINAL \"$(cmakedir-native)\" REALPATH)" -- " if(_BOOST_CMAKEDIR STREQUAL _BOOST_CMAKEDIR_ORIGINAL)" -- " set(_BOOST_CMAKEDIR \"$(cmakedir-native)\")" -- " endif()" -- " unset(_BOOST_CMAKEDIR_ORIGINAL)" -- "endif()" -- "" -- : true ; -- } -- - get-dir "_BOOST_INCLUDEDIR" : $(includedir) ; - - if $(library-type) = INTERFACE diff --git a/boost-1.76.0-fix-narrowing-conversions-for-ppc.patch b/boost-1.76.0-fix-narrowing-conversions-for-ppc.patch deleted file mode 100644 index ce49540..0000000 --- a/boost-1.76.0-fix-narrowing-conversions-for-ppc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0039878782516ea3313608f99f0d50e846151bc2 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Mon, 31 Jan 2022 11:37:29 +0000 -Subject: [PATCH] Fix narrowing conversions for ppc - -These constants are too large for `long long` so are unsigned, -and then cannot be narrowed to the signed type. - -Fixes #29 ---- - .../numeric/interval/detail/ppc_rounding_control.hpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/boost/numeric/interval/detail/ppc_rounding_control.hpp b/include/boost/numeric/interval/detail/ppc_rounding_control.hpp -index 87fe8ee..99f9986 100644 ---- boost_1_76_0/boost/numeric/interval/detail/ppc_rounding_control.hpp -+++ boost_1_76_0/boost/numeric/interval/detail/ppc_rounding_control.hpp -@@ -28,10 +28,10 @@ typedef union { - double dmode; - } rounding_mode_struct; - --static const rounding_mode_struct mode_upward = { 0xFFF8000000000002LL }; --static const rounding_mode_struct mode_downward = { 0xFFF8000000000003LL }; --static const rounding_mode_struct mode_to_nearest = { 0xFFF8000000000000LL }; --static const rounding_mode_struct mode_toward_zero = { 0xFFF8000000000001LL }; -+static const rounding_mode_struct mode_upward = { (::boost::long_long_type)0xFFF8000000000002LL }; -+static const rounding_mode_struct mode_downward = { (::boost::long_long_type)0xFFF8000000000003LL }; -+static const rounding_mode_struct mode_to_nearest = { (::boost::long_long_type)0xFFF8000000000000LL }; -+static const rounding_mode_struct mode_toward_zero = { (::boost::long_long_type)0xFFF8000000000001LL }; - - struct ppc_rounding_control - { diff --git a/boost-1.78.0-b2-build-flags.patch b/boost-1.78.0-b2-build-flags.patch deleted file mode 100644 index 512f109..0000000 --- a/boost-1.78.0-b2-build-flags.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1ded9b9c219542442b3c10af815e5413a2a89c75 Mon Sep 17 00:00:00 2001 -From: Thomas W Rodgers -Date: Tue, 1 Mar 2022 10:03:34 -0800 -Subject: [PATCH] Adjust b2 build flags for Fedora Packaging - ---- - src/engine/build.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh -index f1ad08cb..ab58deba 100755 ---- a/tools/build/src/engine/build.sh -+++ b/tools/build/src/engine/build.sh -@@ -323,7 +323,7 @@ case "${B2_TOOLSET}" in - - gcc|gcc-*) - CXX_VERSION_OPT=${CXX_VERSION_OPT:---version} -- B2_CXXFLAGS_RELEASE="-O2 -s" -+ B2_CXXFLAGS_RELEASE="${RPM_OPT_FLAGS} ${RPM_LD_FLAGS}" - B2_CXXFLAGS_DEBUG="-O0 -g" - ;; - --- -2.35.1 - diff --git a/boost-1.81.0-build-optflags.patch b/boost-1.81.0-build-optflags.patch deleted file mode 100644 index 0f482c8..0000000 --- a/boost-1.81.0-build-optflags.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ebc90bc3e372dc8e5db21f79d2a79e4f5c4d01ee Mon Sep 17 00:00:00 2001 -From: Patrick Palka -Date: Mon, 4 Dec 2023 09:24:20 -0500 -Subject: [PATCH] Adjust options for Fedora package build - ---- - tools/build/src/tools/gcc.jam | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 834f5e1bf..c753afc23 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -513,7 +513,7 @@ rule compile.fortran ( targets * : sources * : properties * ) - - actions compile.c++ bind PCH_FILE - { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)" -+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)" - } - - actions compile.c bind PCH_FILE -@@ -523,7 +523,7 @@ actions compile.c bind PCH_FILE - - actions compile.c++.preprocess bind PCH_FILE - { -- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)" -+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)" - } - - actions compile.c.preprocess bind PCH_FILE -@@ -627,22 +627,22 @@ actions compile.c.pch - ### - - # Declare flags and action for compilation. --toolset.flags gcc.compile OPTIONS off : -O0 ; --toolset.flags gcc.compile OPTIONS speed : -O3 ; --toolset.flags gcc.compile OPTIONS space : -Os ; --toolset.flags gcc.compile OPTIONS minimal : -O1 ; -+toolset.flags gcc.compile OPTIONS off : ; -+toolset.flags gcc.compile OPTIONS speed : ; -+toolset.flags gcc.compile OPTIONS space : ; -+toolset.flags gcc.compile OPTIONS minimal : ; - toolset.flags gcc.compile OPTIONS debug : -Og ; - --toolset.flags gcc.compile OPTIONS off : -fno-inline ; --toolset.flags gcc.compile OPTIONS on : -Wno-inline ; --toolset.flags gcc.compile OPTIONS full : -finline-functions -Wno-inline ; -+toolset.flags gcc.compile OPTIONS off : ; -+toolset.flags gcc.compile OPTIONS on : ; -+toolset.flags gcc.compile OPTIONS full : ; - --toolset.flags gcc.compile OPTIONS off : -w ; --toolset.flags gcc.compile OPTIONS on : -Wall ; --toolset.flags gcc.compile OPTIONS all : -Wall ; --toolset.flags gcc.compile OPTIONS extra : -Wall -Wextra ; --toolset.flags gcc.compile OPTIONS pedantic : -Wall -Wextra -pedantic ; --toolset.flags gcc.compile OPTIONS on : -Werror ; -+toolset.flags gcc.compile OPTIONS off : ; -+toolset.flags gcc.compile OPTIONS on : ; -+toolset.flags gcc.compile OPTIONS all : ; -+toolset.flags gcc.compile OPTIONS extra : ; -+toolset.flags gcc.compile OPTIONS pedantic : ; -+toolset.flags gcc.compile OPTIONS on : ; - - toolset.flags gcc.compile OPTIONS on : -g ; - toolset.flags gcc.compile OPTIONS on : -pg ; --- -2.43.0 - diff --git a/boost-1.90-system.patch b/boost-1.90-system.patch deleted file mode 100644 index 0cadaef..0000000 --- a/boost-1.90-system.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d9554db26c3dbb00a6a293ee4fd4966e4e278da8 Mon Sep 17 00:00:00 2001 -From: Peter Dimov -Date: Mon, 15 Dec 2025 21:51:45 +0200 -Subject: [PATCH] Install boost_system as header-only - ---- - boost-install.jam | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/boost-install.jam b/boost-install.jam -index b87e308..5e6bfa6 100644 ---- a/tools/boost_install/boost-install.jam -+++ b/tools/boost_install/boost-install.jam -@@ -1015,7 +1015,7 @@ local rule install-cmake-config- ( install-or-stage : version : name : requireme - - local library-type = UNKNOWN ; - -- if $(name) = boost_headers || $(name) = boost_math || $(name) = boost_exception -+ if $(name) = boost_headers || $(name) = boost_math || $(name) = boost_exception || $(name) = boost_system - { - library-type = INTERFACE ; - } -From 9529e070ea9e9afd1da17edd48993d560fdc0d7a Mon Sep 17 00:00:00 2001 -From: Peter Dimov -Date: Mon, 15 Dec 2025 21:52:49 +0200 -Subject: [PATCH] Still install boost_system, for the CMake configuration. Refs - #132. - ---- - build.jam | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build.jam b/build.jam -index 65da5aa6..5b6545c8 100644 ---- a/libs/system//build.jam -+++ b/libs/system//build.jam -@@ -21,4 +21,5 @@ explicit - ; - - call-if : boost-library system -+ : install boost_system - ; diff --git a/boost-1.90.0-no-rpath.patch b/boost-1.90.0-no-rpath.patch deleted file mode 100644 index de28890..0000000 --- a/boost-1.90.0-no-rpath.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6a8ff06728b64a1121a6179d891ab0baf3b9290b Mon Sep 17 00:00:00 2001 -From: Patrick Palka -Date: Mon, 4 Dec 2023 09:27:13 -0500 -Subject: [PATCH] Adjust options to remove RPATH for Fedora package builds - ---- - tools/build/src/tools/gcc.jam | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index c753afc23..e0b627726 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -1035,12 +1035,12 @@ rule link.dll ( targets * : sources * : properties * ) - - actions link bind LIBRARIES - { -- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(RPATH_OPTION)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<:T)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) -+ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -o "$(<:T)" $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) - } - - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(RPATH_OPTION)$(SPACE)-Wl,$(RPATH) -Wl,$(IMPLIB_OPTION:E=--out-implib),"$(<[2]:T)" -o "$(<[1]:T)" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) -+ "$(CONFIG_COMMAND)" @($(<[1]:T).rsp:O=FC:<=@":>=":E=-L"$(LINKPATH)" -Wl,$(IMPLIB_OPTION:E=--out-implib),"$(<[2]:T)" -o "$(<[1]:T)" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,"$(SONAME_PREFIX:E=)$(<[1]:D=)" $(SHARED_OPTION:E=-shared) $(START-GROUP) "$(>:T)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)) - } - - ### --- -2.43.0 - diff --git a/boost-1.90.0-range.patch b/boost-1.90.0-range.patch deleted file mode 100644 index e4dfef3..0000000 --- a/boost-1.90.0-range.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9ac89e9936b826c13e90611cb9a81a7aa0508d20 Mon Sep 17 00:00:00 2001 -From: Michael Cho -Date: Sun, 30 Mar 2025 21:45:49 -0400 -Subject: [PATCH] Add include for add_const - -Signed-off-by: Michael Cho ---- - include/boost/range/detail/any_iterator_interface.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/boost/range/detail/any_iterator_interface.hpp b/include/boost/range/detail/any_iterator_interface.hpp -index 1103be6c..79e71dbd 100644 ---- boost_1_90_0/boost/range/detail/any_iterator_interface.hpp -+++ boost_1_90_0/boost/range/detail/any_iterator_interface.hpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/boost-cmake-soname.patch b/boost-cmake-soname.patch new file mode 100644 index 0000000..8d732eb --- /dev/null +++ b/boost-cmake-soname.patch @@ -0,0 +1,19 @@ +*** tools/build/CMake/BoostCore.cmake.orig 2010-01-12 20:01:46.006547352 -0800 +--- tools/build/CMake/BoostCore.cmake 2010-01-12 20:02:54.222546929 -0800 +*************** macro(boost_library_variant LIBNAME) +*** 755,761 **** + if (BUILD_SOVERSIONED) + set_target_properties(${VARIANT_LIBNAME} + PROPERTIES +! SOVERSION "${BOOST_VERSION}" + ) + endif() + endif () +--- 755,761 ---- + if (BUILD_SOVERSIONED) + set_target_properties(${VARIANT_LIBNAME} + PROPERTIES +! SOVERSION "_FEDORA_SONAME" + ) + endif() + endif () diff --git a/boost.rpmlintrc b/boost.rpmlintrc deleted file mode 100644 index c8a2596..0000000 --- a/boost.rpmlintrc +++ /dev/null @@ -1,24 +0,0 @@ -# The meta-package doesn't contain any files, this is intended. -addFilter("boost.x86_64: E: no-binary") - -# All docs are in a separate boost-doc package -addFilter("boost.*: W: no-documentation") -addFilter("boost.*: W: description-shorter-than-summary") - -# Upstream don't provide one -addFilter("boost-doctools.x86_64: W: no-manual-page-for-binary quickbook") - -# Ignore these -addFilter("boost.*: W: spelling-error %description -l en_US foundational ") -addFilter("boost.*: W: spelling-error %description -l en_US invariants ") -addFilter("boost.*: W: spelling-error %description -l en_US postconditions ") -addFilter("boost.*: W: spelling-error %description -l en_US userland ") -addFilter("boost.*: W: spelling-error Summary(en_US) numpy ") - -# The example code is useless without the headers -addFilter("boost-examples.x86_64: E: devel-dependency boost-devel") - -# These libs are statically linked -addFilter("boost-date-time.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_date_time.so.*") -addFilter("boost-system.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_system.so.*") -addFilter("boost-stacktrace.x86_64: E: shared-lib-without-dependency-information /usr/lib64/libboost_stacktrace_noop.so.*") diff --git a/boost.spec b/boost.spec index 0ee6ede..6fd3229 100644 --- a/boost.spec +++ b/boost.spec @@ -16,24 +16,21 @@ # All arches have mpich %bcond_without mpich -%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 -%ifarch %{ix86} - # No OpenMPI support on these arches - %bcond_with openmpi -%else - %bcond_without openmpi -%endif +%ifarch s390 + # No OpenMPI support on these arches + %bcond_with openmpi %else %bcond_without openmpi %endif %endif -%ifnarch %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64 s390x riscv64 +%ifnarch %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64 %bcond_with context %else %bcond_without context %endif +%bcond_without python2 %bcond_without python3 %ifnarch %{ix86} x86_64 @@ -42,48 +39,34 @@ %bcond_without quadmath %endif -%ifnarch x86_64 - %bcond_with stacktrace_from_exception -%else - %bcond_without stacktrace_from_exception -%endif - Name: boost %global real_name boost Summary: The free peer-reviewed portable C++ source libraries -Version: 1.90.0 -Release: 4%{?dist} -License: BSL-1.0 AND MIT AND Python-2.0.1 +Version: 1.69.0 +%global version_enc 1_69_0 +%global version_suffix 169 +Release: 12%{?dist} +License: Boost and MIT and Python -# Replace each . with _ in %%{version} -%global version_enc %{lua: - local ver = rpm.expand("%{version}") - ver = ver:gsub("%.", "_") - print(ver) -} %global toplev_dirname %{real_name}_%{version_enc} URL: http://www.boost.org -# https://archives.boost.io/release/1.90.0/source/boost_1_90_0.tar.bz2 -Source0: https://archives.boost.io/release/%{version}/source/%{name}_%{version_enc}.tar.bz2 -# Add a manual page for b2, based on the online documentation: -# http://www.boost.org/boost-build2/doc/html/bbv2/overview.html -Source1: b2.1 +Source0: https://sourceforge.net/projects/boost/files/%{real_name}/%{version}/%{toplev_dirname}.tar.bz2 +Source1: libboost_thread.so # Since Fedora 13, the Boost libraries are delivered with sonames # equal to the Boost version (e.g., 1.41.0). %global sonamever %{version} # boost is an "umbrella" package that pulls in all boost shared library -# components, except for MPI sub-packages. Those are special in that -# there are alternative implementations to choose from (Open MPI and MPICH), -# and it's not a big burden to have interested parties install them explicitly. +# components, except for MPI and Python sub-packages. Those are special +# in that there are alternative implementations to choose from +# (Open MPI and MPICH, and Python 2 and 3), and it's not a big burden +# to have interested parties install them explicitly. # The subpackages that don't install shared libraries are also not pulled in -# (b2, build, doc, doctools, examples, static). +# (doc, doctools, examples, jam, static). Requires: %{name}-atomic%{?_isa} = %{version}-%{release} -Requires: %{name}-charconv%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-cobalt%{?_isa} = %{version}-%{release} Requires: %{name}-container%{?_isa} = %{version}-%{release} Requires: %{name}-contract%{?_isa} = %{version}-%{release} %if %{with context} @@ -97,40 +80,32 @@ Requires: %{name}-fiber%{?_isa} = %{version}-%{release} Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} Requires: %{name}-graph%{?_isa} = %{version}-%{release} Requires: %{name}-iostreams%{?_isa} = %{version}-%{release} -Requires: %{name}-json%{?_isa} = %{version}-%{release} Requires: %{name}-locale%{?_isa} = %{version}-%{release} Requires: %{name}-log%{?_isa} = %{version}-%{release} Requires: %{name}-math%{?_isa} = %{version}-%{release} -Requires: %{name}-nowide%{?_isa} = %{version}-%{release} -Requires: %{name}-process%{?_isa} = %{version}-%{release} Requires: %{name}-program-options%{?_isa} = %{version}-%{release} -%if %{with python3} -Requires: %{name}-python3%{?_isa} = %{version}-%{release} -%endif Requires: %{name}-random%{?_isa} = %{version}-%{release} Requires: %{name}-regex%{?_isa} = %{version}-%{release} Requires: %{name}-serialization%{?_isa} = %{version}-%{release} Requires: %{name}-stacktrace%{?_isa} = %{version}-%{release} +Requires: %{name}-system%{?_isa} = %{version}-%{release} Requires: %{name}-test%{?_isa} = %{version}-%{release} Requires: %{name}-thread%{?_isa} = %{version}-%{release} Requires: %{name}-timer%{?_isa} = %{version}-%{release} Requires: %{name}-type_erasure%{?_isa} = %{version}-%{release} -Requires: %{name}-url%{?_isa} = %{version}-%{release} Requires: %{name}-wave%{?_isa} = %{version}-%{release} -# F44 dropped the boost-system subpackage -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 - -%if %{with python3} -Recommends: (boost-numpy3 if python3-numpy) -%endif +# Added for F30, remove for F32 +Obsoletes: %{name}-signals < 1.69.0 BuildRequires: gcc-c++ BuildRequires: m4 BuildRequires: libstdc++-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: xz-devel +%if %{with python2} +BuildRequires: python2-devel +BuildRequires: python2-numpy +%endif %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-numpy @@ -139,32 +114,52 @@ BuildRequires: libicu-devel %if %{with quadmath} BuildRequires: libquadmath-devel %endif -BuildRequires: bison -BuildRequires: libzstd-devel -# https://bugzilla.redhat.com/show_bug.cgi?id=1541035 -Patch0: boost-1.81.0-build-optflags.patch +# https://svn.boost.org/trac/boost/ticket/6150 +Patch4: boost-1.50.0-fix-non-utf8-files.patch + +# Add a manual page for bjam, based on the on-line documentation: +# http://www.boost.org/boost-build2/doc/html/bbv2/overview.html +Patch5: boost-1.48.0-add-bjam-man-page.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=828856 +# https://bugzilla.redhat.com/show_bug.cgi?id=828857 +# https://svn.boost.org/trac/boost/ticket/6701 +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/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.66.0-python-abi_letters.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1190039 +Patch65: boost-1.66.0-build-optflags.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1318383 -Patch1: boost-1.90.0-no-rpath.patch - -# https://lists.boost.org/Archives/boost/2020/04/248812.php -Patch2: boost-1.73.0-cmakedir.patch +Patch82: boost-1.66.0-no-rpath.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1541035 -Patch3: boost-1.78.0-b2-build-flags.patch +Patch83: boost-1.66.0-bjam-build-flags.patch -# PR https://github.com/boostorg/interval/pull/30 -# Fixes narrowing conversions for ppc - -# https://github.com/boostorg/interval/issues/29 -Patch5: boost-1.76.0-fix-narrowing-conversions-for-ppc.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1673669 +Patch84: boost-1.69-random.patch -# Install boost_system for the CMake configuration -# https://github.com/boostorg/system/issues/132 -Patch6: boost-1.90-system.patch +# https://github.com/boostorg/mpi/pull/81 +Patch85: boost-1.69-mpi-c_data.patch -# https://github.com/boostorg/range/pull/157 -Patch7: boost-1.90.0-range.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1818723 +Patch86: boost-1.69-format-allocator.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1832639 +Patch87: boost-1.69.0-test-cxx20.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1834764 +Patch88: auto_buffer-C-20-compatibility.patch %bcond_with tests %bcond_with docs_generated @@ -189,33 +184,14 @@ types and operations on these data types, as well as memory ordering constraints required for coordinating multiple threads through atomic variables. -%package charconv -Summary: Run-time component of boost charconv library - -%description charconv - -Run-time support for Boost.Charconv, an implementation of -in C++11. - %package chrono Summary: Run-time component of boost chrono library -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 +Requires: %{name}-system%{?_isa} = %{version}-%{release} %description chrono Run-time support for Boost.Chrono, a set of useful time utilities. -%package cobalt -Summary: Run-time component of boost cobalt library - -%description cobalt - -Boost.Cobalt provides a set of easy to use coroutine primitives & utilities -running on top of boost.asio. These will be of interest for applications that -perform a lot of IO that want to not block unnecessarily, yet still want to -have linear & readable code (i..e. avoid callbacks). - %package container Summary: Run-time component of boost container library @@ -224,8 +200,7 @@ Summary: Run-time component of boost container library Boost.Container library implements several well-known containers, including STL containers. The aim of the library is to offer advanced features not present in standard containers or to offer the latest -standard draft features for compilers that don't comply with the -latest C++ standard. +standard draft features for compilers that comply with C++03. %package contract Summary: Run-time component of boost contract library @@ -250,7 +225,6 @@ provides a sort of cooperative multitasking on a single thread. %package coroutine Summary: Run-time component of boost coroutine library -Requires: %{name}-context%{?_isa} = %{version}-%{release} %description coroutine Run-time support for Boost.Coroutine, a library that provides @@ -270,8 +244,6 @@ on generic programming concepts. %if %{with context} %package fiber Summary: Run-time component of boost fiber library -Requires: %{name}-context%{?_isa} = %{version}-%{release} -Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} %description fiber @@ -281,9 +253,7 @@ micro-/userland-threads (fibers) scheduled cooperatively. %package filesystem Summary: Run-time component of boost filesystem library -Requires: %{name}-atomic%{?_isa} = %{version}-%{release} -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 +Requires: %{name}-system%{?_isa} = %{version}-%{release} %description filesystem @@ -309,22 +279,11 @@ Summary: Run-time component of boost iostreams library Run-time support for Boost.Iostreams, a framework for defining streams, stream buffers and i/o filters. -%package json -Summary: Run-time component of boost json library -Requires: %{name}-container%{?_isa} = %{version}-%{release} - -%description json - -Run-time support for Boost.Json, a portable C++ library which provides -containers and algorithms that implement JavaScript Object Notation, or -simply "JSON" - %package locale Summary: Run-time component of boost locale library Requires: %{name}-chrono%{?_isa} = %{version}-%{release} +Requires: %{name}-system%{?_isa} = %{version}-%{release} Requires: %{name}-thread%{?_isa} = %{version}-%{release} -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 %description locale @@ -333,32 +292,40 @@ handling tools. %package log Summary: Run-time component of boost logging library -Requires: %{name}-atomic%{?_isa} = %{version}-%{release} -Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} -Requires: %{name}-regex%{?_isa} = %{version}-%{release} -Requires: %{name}-thread%{?_isa} = %{version}-%{release} %description log -Run-time support for Boost.Log, a modular and extensible logging -library that supports both narrow-character and wide-character logging. +Boost.Log library aims to make logging significantly easier for the +application developer. It provides a wide range of out-of-the-box +tools along with public interfaces for extending the library. %package math -Summary: Run-time component of boost math toolkit +Summary: Math functions for boost TR1 library %description math -Run-time support for Boost.Math, including floating-point utilities, -specific width floating-point types, mathematical constants, -statistical distributions, special functions, and more. +Run-time support for C99 and C++ TR1 C-style Functions from the math +portion of Boost.TR1. -%package nowide -Summary: Standard library functions with UTF-8 API on Windows +%if %{with python2} -%description nowide +%package numpy2 +Summary: Run-time component of boost numpy library for Python 2 +Requires: %{name}-python2%{?_isa} = %{version}-%{release} +Requires: python2-numpy +# Added for F29, remove for F31: +Provides: %{name}-numpy%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-numpy < %{version}-%{release} -Run-time support for Boost.Nowide. +%description numpy2 + +The Boost Python Library is a framework for interfacing Python and +C++. It allows you to quickly and seamlessly expose C++ classes, +functions and objects to Python, and vice versa, using no special +tools -- just your C++ compiler. This package contains run-time +support for the NumPy extension of the Boost Python Library for Python 2. + +%endif %if %{with python3} @@ -377,14 +344,6 @@ support for the NumPy extension of the Boost Python Library for Python 3. %endif -%package process -Summary: Run-time component of boost process library - -%description process - -Run-time support of the Boost.Process library, for managing system -processes. - %package program-options Summary: Run-time component of boost program_options library @@ -394,10 +353,35 @@ 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. +%if %{with python2} + +%package python2 +Summary: Run-time component of boost python library for Python 2 + +%description python2 + +The Boost Python Library is a framework for interfacing Python and +C++. It allows you to quickly and seamlessly expose C++ classes, +functions and objects to Python, and vice versa, using no special +tools -- just your C++ compiler. This package contains run-time +support for the Boost Python Library compiled for Python 2. + +%package python2-devel +Summary: Shared object symbolic links for Boost.Python 2 +Requires: %{name}-numpy2%{?_isa} = %{version}-%{release} +Requires: %{name}-python2%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description python2-devel + +Shared object symbolic links for Python 2 variant of Boost.Python. + +%endif + %if %{with python3} + %package python3 Summary: Run-time component of boost python library for Python 3 -Requires: python(abi) = %{python3_version} %description python3 @@ -406,6 +390,17 @@ C++. It allows you to quickly and seamlessly expose C++ classes, functions and objects to Python, and vice versa, using no special tools -- just your C++ compiler. This package contains run-time support for the Boost Python Library compiled for Python 3. + +%package python3-devel +Summary: Shared object symbolic links for Boost.Python 3 +Requires: %{name}-numpy3%{?_isa} = %{version}-%{release} +Requires: %{name}-python3%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description python3-devel + +Shared object symbolic links for Python 3 variant of Boost.Python. + %endif %package random @@ -436,6 +431,14 @@ Summary: Run-time component of boost stacktrace library Run-time component of the Boost stacktrace library. +%package system +Summary: Run-time component of boost system support library + +%description system + +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 @@ -446,8 +449,7 @@ program execution monitoring. %package thread Summary: Run-time component of boost thread library -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 +Requires: %{name}-system%{?_isa} = %{version}-%{release} %description thread @@ -459,8 +461,7 @@ data specific to individual threads. %package timer Summary: Run-time component of boost timer library Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 +Requires: %{name}-system%{?_isa} = %{version}-%{release} %description timer @@ -471,31 +472,20 @@ with as little as one #include and one additional line of code. %package type_erasure Summary: Run-time component of boost type erasure library Requires: %{name}-chrono%{?_isa} = %{version}-%{release} -Requires: %{name}-thread%{?_isa} = %{version}-%{release} -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 +Requires: %{name}-system%{?_isa} = %{version}-%{release} %description type_erasure The Boost.TypeErasure library provides runtime polymorphism in C++ that is more flexible than that provided by the core language. -%package url -Summary: Runtime component of boost URL library - -%description url - -Run-time support for the Boost.URL library, a Standards conforming -library for parsing Uniform Resource Locators. - %package wave Summary: Run-time component of boost C99/C++ preprocessing library Requires: %{name}-chrono%{?_isa} = %{version}-%{release} Requires: %{name}-date-time%{?_isa} = %{version}-%{release} Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} +Requires: %{name}-system%{?_isa} = %{version}-%{release} Requires: %{name}-thread%{?_isa} = %{version}-%{release} -Obsoletes: boost-system < 1.90.0 -Conflicts: boost-system < 1.90.0 %description wave @@ -510,13 +500,6 @@ Requires: libicu-devel%{?_isa} %if %{with quadmath} Requires: libquadmath-devel%{?_isa} %endif -%if %{with python3} -# Require boost-numpy3 here, because main boost metapackage only Recommends: it -Requires: %{name}-numpy3%{?_isa} = %{version}-%{release} -# Old Provides: for compatibility with packages that still require it. -Provides: %{name}-python3-devel = %{version}-%{release} -Provides: %{name}-python3-devel%{?_isa} = %{version}-%{release} -%endif %description devel Headers and shared object symbolic links for the Boost C++ libraries. @@ -573,6 +556,36 @@ Requires: %{name}-graph-openmpi%{?_isa} = %{version}-%{release} Devel package for Boost.MPI-OpenMPI, a library providing a clean C++ API over the OpenMPI implementation of MPI. +%if %{with python2} + +%package openmpi-python2 +Summary: Python 2 run-time component of Boost.MPI library +Requires: %{name}-openmpi%{?_isa} = %{version}-%{release} +Requires: %{name}-python2%{?_isa} = %{version}-%{release} +Requires: %{name}-serialization%{?_isa} = %{version}-%{release} +Requires: python2-openmpi%{?_isa} +# Added for F29, remove for F31: +Provides: %{name}-openmpi-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-openmpi-python < %{version}-%{release} + +%description openmpi-python2 + +Python 2 support for Boost.MPI-OpenMPI, a library providing a clean C++ +API over the OpenMPI implementation of MPI. + +%package openmpi-python2-devel +Summary: Shared library symbolic links for Boost.MPI Python 2 component +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-openmpi-python2%{?_isa} = %{version}-%{release} + +%description openmpi-python2-devel + +Devel package for the Python 2 interface of Boost.MPI-OpenMPI, a library +providing a clean C++ API over the OpenMPI implementation of MPI. + +%endif + %if %{with python3} %package openmpi-python3 @@ -590,6 +603,7 @@ API over the OpenMPI implementation of MPI. %package openmpi-python3-devel Summary: Shared library symbolic links for Boost.MPI Python 3 component Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-python3-devel%{?_isa} = %{version}-%{release} Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release} Requires: %{name}-openmpi-python3%{?_isa} = %{version}-%{release} @@ -638,6 +652,36 @@ Requires: %{name}-graph-mpich%{?_isa} = %{version}-%{release} Devel package for Boost.MPI-MPICH, a library providing a clean C++ API over the MPICH implementation of MPI. +%if %{with python2} + +%package mpich-python2 +Summary: Python run-time component of Boost.MPI library +Requires: %{name}-mpich%{?_isa} = %{version}-%{release} +Requires: %{name}-python2%{?_isa} = %{version}-%{release} +Requires: %{name}-serialization%{?_isa} = %{version}-%{release} +Requires: python2-mpich%{?_isa} +# Added for F29, remove for F31: +Provides: %{name}-mpich-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-mpich-python < %{version}-%{release} + +%description mpich-python2 + +Python 2 support for Boost.MPI-MPICH, a library providing a clean C++ +API over the MPICH implementation of MPI. + +%package mpich-python2-devel +Summary: Shared library symbolic links for Boost.MPI Python 2 component +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-mpich-python2%{?_isa} = %{version}-%{release} + +%description mpich-python2-devel + +Devel package for the Python 2 interface of Boost.MPI-MPICH, a library +providing a clean C++ API over the MPICH implementation of MPI. + +%endif + %if %{with python3} %package mpich-python3 @@ -655,6 +699,7 @@ API over the MPICH implementation of MPI. %package mpich-python3-devel Summary: Shared library symbolic links for Boost.MPI Python 3 component Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-python3-devel%{?_isa} = %{version}-%{release} Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release} Requires: %{name}-mpich-python3%{?_isa} = %{version}-%{release} @@ -681,7 +726,7 @@ back-end to do the parallel work. %package build Summary: Cross platform build system for C++ projects -Requires: %{name}-b2 +Requires: %{name}-jam BuildArch: noarch %description build @@ -701,21 +746,39 @@ Requires: docbook-style-xsl Tools for working with Boost documentation in BoostBook or QuickBook format. -%package b2 +%package jam Summary: A low-level build tool -%description b2 -B2 (formerly Boost.Jam) is the low-level build engine tool for Boost.Build. -Historically, B2 was based on on FTJam and on Perforce Jam but has grown +%description jam +Boost.Jam (BJam) is the low-level build engine tool for Boost.Build. +Historically, Boost.Jam is based on on FTJam and on Perforce Jam but has grown a number of significant features and is now developed independently. %prep -%autosetup -n %{toplev_dirname} -p1 -find ./boost -name '*.hpp' -perm /111 | xargs --no-run-if-empty chmod a-x +%setup -q -n %{toplev_dirname} +find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x + +%patch4 -p1 +%patch5 -p1 +%patch15 -p0 +%patch25 -p1 +%patch51 -p1 +%patch61 -p1 +%patch62 -p1 +%patch65 -p1 +%patch82 -p1 +%patch83 -p1 +%patch84 -p2 +%patch85 -p2 +%patch86 -p1 +%patch87 -p2 +%patch88 -p2 %build -%set_build_flags # Dump the versions being used into the build logs. +%if %{with python2} +: PYTHON2_VERSION=%{python2_version} +%endif %if %{with python3} PYTHON3_ABIFLAGS=$(/usr/bin/python3-config --abiflags) : PYTHON3_VERSION=%{python3_version} @@ -733,19 +796,16 @@ import os ; local RPM_OPT_FLAGS = [ os.environ RPM_OPT_FLAGS ] ; local RPM_LD_FLAGS = [ os.environ RPM_LD_FLAGS ] ; -using %{toolchain} : : : $(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) ; +using gcc : : : $(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) ; %if %{with openmpi} || %{with mpich} using mpi ; %endif -EOF - -%if %{with python3} -cat >> ./tools/build/src/user-config.jam << EOF -using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{python3_version}${PYTHON3_ABIFLAGS} : : : ; -EOF +%if %{with python2} +using python : %{python2_version} : /usr/bin/python2 : /usr/include/python%{python2_version} : : : : ; %endif +EOF -./bootstrap.sh --with-toolset=%{toolchain} --with-icu --prefix=$RPM_BUILD_ROOT%{_prefix} +./bootstrap.sh --with-toolset=gcc --with-icu # N.B. When we build the following with PCH, parts of boost (math # library in particular) end up being built second time during @@ -759,15 +819,57 @@ echo ============================= build serial ================== --without-context --without-coroutine \ --without-fiber \ %endif - variant=release threading=multi debug-symbols=on pch=off \ -%if %{with python3} - python=%{python3_version} \ +%if !%{with python2} + --without-python \ %endif -%if !%{with stacktrace_from_exception} - boost.stacktrace.from_exception=off \ + variant=release threading=multi debug-symbols=on pch=off \ +%if %{with python2} + python=%{python2_version} \ %endif stage +# See libs/thread/build/Jamfile.v2 for where this file comes from. +if [ $(find serial -type f -name has_atomic_flag_lockfree \ + -print -quit | wc -l) -ne 0 ]; then + DEF=D +else + DEF=U +fi + +m4 -${DEF}HAS_ATOMIC_FLAG_LOCKFREE -DVERSION=%{version} \ + %{SOURCE1} > $(basename %{SOURCE1}) + +%if %{with python3} + +# Previously, we built python 2.x and 3.x interfaces simultaneously. +# However, this does not work once trying to build other Python components +# such as libboost_numpy. Therefore, we build for each separately, while +# minimizing duplicate compilation as much as possible. + +cat > python3-config.jam << "EOF" +import os ; +local RPM_OPT_FLAGS = [ os.environ RPM_OPT_FLAGS ] ; +local RPM_LD_FLAGS = [ os.environ RPM_LD_FLAGS ] ; + +using gcc : : : $(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) ; +%if %{with openmpi} || %{with mpich} +using mpi ; +%endif +EOF + +cat >> python3-config.jam << EOF +using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{python3_version}${PYTHON3_ABIFLAGS} : : : : ${PYTHON3_ABIFLAGS} ; +EOF + +echo ============================= build serial-py3 ================== +./b2 -d+2 -q %{?_smp_mflags} \ + --user-config=./python3-config.jam \ + --with-python --build-dir=serial-py3 \ + variant=release threading=multi debug-symbols=on pch=off \ + python=%{python3_version} stage + +%endif + # Build MPI parts of Boost with OpenMPI support %if %{with openmpi} || %{with mpich} @@ -778,12 +880,20 @@ module purge ||: %if %{with openmpi} %{_openmpi_load} - -%if %{with python3} +%if %{with python2} echo ============================= build $MPI_COMPILER ================== ./b2 -d+2 -q %{?_smp_mflags} \ --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ variant=release threading=multi debug-symbols=on pch=off \ + python=%{python2_version} stage +%endif + +%if %{with python3} +echo ============================= build $MPI_COMPILER-py3 ================== +./b2 -d+2 -q %{?_smp_mflags} \ + --user-config=./python3-config.jam \ + --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER-py3 \ + variant=release threading=multi debug-symbols=on pch=off \ python=%{python3_version} stage %endif @@ -794,12 +904,20 @@ export PATH=/bin${PATH:+:}$PATH # Build MPI parts of Boost with MPICH support %if %{with mpich} %{_mpich_load} - -%if %{with python3} +%if %{with python2} echo ============================= build $MPI_COMPILER ================== ./b2 -d+2 -q %{?_smp_mflags} \ --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ variant=release threading=multi debug-symbols=on pch=off \ + python=%{python2_version} stage +%endif + +%if %{with python3} +echo ============================= build $MPI_COMPILER-py3 ================== +./b2 -d+2 -q %{?_smp_mflags} \ + --user-config=./python3-config.jam \ + --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER-py3 \ + variant=release threading=multi debug-symbols=on pch=off \ python=%{python3_version} stage %endif @@ -809,7 +927,7 @@ export PATH=/bin${PATH:+:}$PATH echo ============================= build Boost.Build ================== (cd tools/build - ./bootstrap.sh --with-toolset=%{toolchain} --prefix=$RPM_BUILD_ROOT%{_prefix}) + ./bootstrap.sh --with-toolset=gcc) %check : @@ -828,30 +946,39 @@ module purge ||: %{_openmpi_load} # XXX We want to extract this from RPM flags # b2 instruction-set=i686 etc. - -%if %{with python3} +%if %{with python2} echo ============================= install $MPI_COMPILER ================== ./b2 -q %{?_smp_mflags} \ --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ --stagedir=${RPM_BUILD_ROOT}${MPI_HOME} \ variant=release threading=multi debug-symbols=on pch=off \ + python=%{python2_version} stage + +# Move Python module to proper location for automatic loading +mkdir -p ${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost +touch ${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost/__init__.py +mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/mpi.so \ + ${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost/ +%endif + +%if %{with python3} +echo ============================= install $MPI_COMPILER-py3 ================== +./b2 -q %{?_smp_mflags} \ + --user-config=./python3-config.jam \ + --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER-py3 \ + --stagedir=${RPM_BUILD_ROOT}${MPI_HOME} \ + variant=release threading=multi debug-symbols=on pch=off \ python=%{python3_version} stage # Move Python module to proper location for automatic loading mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost touch ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost/__init__.py -mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \ +mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/mpi.so \ ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost/ %endif -# Using 'b2 stage' does not fix the paths in these files, so do it manually -sed -i -e 's|get_filename_component(_BOOST_INCLUDEDIR "${_BOOST_CMAKEDIR}/.*"|get_filename_component(_BOOST_INCLUDEDIR "${_BOOST_CMAKEDIR}/../../../../include"|' ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake/*/*-config.cmake - # Remove generic parts of boost that were built for dependencies. rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}* -rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy* -rm -rf ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake/boost_{python,{w,}serialization}* -rm -rf ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake/boost_numpy* %{_openmpi_unload} export PATH=/bin${PATH:+:}$PATH @@ -859,30 +986,39 @@ export PATH=/bin${PATH:+:}$PATH %if %{with mpich} %{_mpich_load} - -%if %{with python3} +%if %{with python2} echo ============================= install $MPI_COMPILER ================== ./b2 -q %{?_smp_mflags} \ --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \ --stagedir=${RPM_BUILD_ROOT}${MPI_HOME} \ variant=release threading=multi debug-symbols=on pch=off \ + python=%{python2_version} stage + +# Move Python module to proper location for automatic loading +mkdir -p ${RPM_BUILD_ROOT}%{python2_sitearch}/mpich/boost +touch ${RPM_BUILD_ROOT}%{python2_sitearch}/mpich/boost/__init__.py +mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/mpi.so \ + ${RPM_BUILD_ROOT}%{python2_sitearch}/mpich/boost/ +%endif + +%if %{with python3} +echo ============================= install $MPI_COMPILER-py3 ================== +./b2 -q %{?_smp_mflags} \ + --user-config=./python3-config.jam \ + --with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER-py3 \ + --stagedir=${RPM_BUILD_ROOT}${MPI_HOME} \ + variant=release threading=multi debug-symbols=on pch=off \ python=%{python3_version} stage # Move Python module to proper location for automatic loading mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}/mpich/boost touch ${RPM_BUILD_ROOT}%{python3_sitearch}/mpich/boost/__init__.py -mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \ +mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/mpi.so \ ${RPM_BUILD_ROOT}%{python3_sitearch}/mpich/boost/ %endif -# Using 'b2 stage' does not fix the paths in these files, so do it manually -sed -i -e 's|get_filename_component(_BOOST_INCLUDEDIR "${_BOOST_CMAKEDIR}/.*"|get_filename_component(_BOOST_INCLUDEDIR "${_BOOST_CMAKEDIR}/../../../../include"|' ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake/*/*-config.cmake - # Remove generic parts of boost that were built for dependencies. rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}* -rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_numpy* -rm -rf ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake/boost_{python,{w,}serialization}* -rm -rf ${RPM_BUILD_ROOT}${MPI_HOME}/lib/cmake/boost_numpy* %{_mpich_unload} export PATH=/bin${PATH:+:}$PATH @@ -894,52 +1030,54 @@ echo ============================= install serial ================== %if !%{with context} --without-context --without-coroutine \ --without-fiber \ +%endif +%if !%{with python2} + --without-python \ %endif --prefix=$RPM_BUILD_ROOT%{_prefix} \ --libdir=$RPM_BUILD_ROOT%{_libdir} \ variant=release threading=multi debug-symbols=on pch=off \ -%if %{with python3} - python=%{python3_version} \ -%endif -%if !%{with stacktrace_from_exception} - boost.stacktrace.from_exception=off \ +%if %{with python2} + python=%{python2_version} \ %endif install -cat > $RPM_BUILD_ROOT%{_libdir}/libboost_system.so << EOT -/* GNU ld script +# Override DSO symlink with a linker script. See the linker script +# itself for details of why we need to do this. +[ -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so ] # Must be present +rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so +install -p -m 644 $(basename %{SOURCE1}) $RPM_BUILD_ROOT%{_libdir}/ -There is no runtime library for Boost.System. -This empty linker script exists to support Fedora packages which use --lboost_system when linking and so require a library with that name. +%if %{with python3} +echo ============================= install serial-py3 ================== +./b2 -d+2 -q %{?_smp_mflags} \ + --user-config=python3-config.jam \ + --with-python --build-dir=serial-py3 \ + --prefix=$RPM_BUILD_ROOT%{_prefix} \ + --libdir=$RPM_BUILD_ROOT%{_libdir} \ + variant=release threading=multi debug-symbols=on pch=off \ + python=%{python3_version} install -This linker script will be remove in a future Fedora release. -*/ -EOT -chmod 644 $RPM_BUILD_ROOT%{_libdir}/libboost_system.so +%endif echo ============================= install Boost.Build ================== (cd tools/build ./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install - - # Somewhere along the line the boost-build install directory became b2 - # which seems not so great for our purposes, fix that up - mv $RPM_BUILD_ROOT%{_datadir}/b2 $RPM_BUILD_ROOT%{_datadir}/boost-build - - # but make a symlink so b2 knows where to look - pushd $RPM_BUILD_ROOT%{_datadir}/ - ln -s ./boost-build b2 - popd - # Fix some permissions + chmod -x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/build/alias.py + chmod -x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/kernel/boost-build.jam + chmod -x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/options/help.jam chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py # Fix shebang using unversioned python sed -i '1s@^#!/usr/bin.python$@&3@' $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py + # We don't want to distribute this + rm -f $RPM_BUILD_ROOT%{_bindir}/b2 + # Not a real file + rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/build/project.ann.py # Empty file - rm $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp # Install the manual page - %{__install} -p -m 644 %{SOURCE1} -D $RPM_BUILD_ROOT%{_mandir}/man1/b2.1 + %{__install} -p -m 644 v2/doc/bjam.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1 ) echo ============================= install Boost.QuickBook ================== @@ -1015,11 +1153,6 @@ rm -f tmp-doc-files-to-be-installed rm -f tmp-doc-directories %{__install} -p -m 644 -t $EXAMPLESPATH LICENSE_1_0.txt -# The predef_check utility doesn't seem useful to package. -(cd $RPM_BUILD_ROOT/%{_datadir} - rm boost_predef/tools/check/* - rm boost_predef/build.jam -) %post doctools CATALOG=%{_sysconfdir}/xml/catalog @@ -1054,19 +1187,10 @@ fi %license LICENSE_1_0.txt %{_libdir}/libboost_atomic.so.%{sonamever} -%files charconv -%license LICENSE_1_0.txt -%{_libdir}/libboost_charconv.so.%{sonamever} - %files chrono %license LICENSE_1_0.txt %{_libdir}/libboost_chrono.so.%{sonamever} -%files cobalt -%license LICENSE_1_0.txt -%{_libdir}/libboost_cobalt.so.%{sonamever} -%{_libdir}/libboost_cobalt_io.so.%{sonamever} - %files container %license LICENSE_1_0.txt %{_libdir}/libboost_container.so.%{sonamever} @@ -1105,10 +1229,6 @@ fi %license LICENSE_1_0.txt %{_libdir}/libboost_iostreams.so.%{sonamever} -%files json -%license LICENSE_1_0.txt -%{_libdir}/libboost_json.so.%{sonamever} - %files locale %license LICENSE_1_0.txt %{_libdir}/libboost_locale.so.%{sonamever} @@ -1127,9 +1247,11 @@ fi %{_libdir}/libboost_math_tr1f.so.%{sonamever} %{_libdir}/libboost_math_tr1l.so.%{sonamever} -%files nowide +%if %{with python2} +%files numpy2 %license LICENSE_1_0.txt -%{_libdir}/libboost_nowide.so.%{sonamever} +%{_libdir}/libboost_numpy%{python2_version_nodots}.so.%{sonamever} +%endif %if %{with python3} %files numpy3 @@ -1137,10 +1259,6 @@ fi %{_libdir}/libboost_numpy%{python3_version_nodots}.so.%{sonamever} %endif -%files process -%license LICENSE_1_0.txt -%{_libdir}/libboost_process.so.%{sonamever} - %files test %license LICENSE_1_0.txt %{_libdir}/libboost_prg_exec_monitor.so.%{sonamever} @@ -1150,10 +1268,26 @@ fi %license LICENSE_1_0.txt %{_libdir}/libboost_program_options.so.%{sonamever} +%if %{with python2} +%files python2 +%license LICENSE_1_0.txt +%{_libdir}/libboost_python%{python2_version_nodots}.so.%{sonamever} + +%files python2-devel +%license LICENSE_1_0.txt +%{_libdir}/libboost_numpy%{python2_version_nodots}.so +%{_libdir}/libboost_python%{python2_version_nodots}.so +%endif + %if %{with python3} %files python3 %license LICENSE_1_0.txt %{_libdir}/libboost_python%{python3_version_nodots}.so.%{sonamever} + +%files python3-devel +%license LICENSE_1_0.txt +%{_libdir}/libboost_numpy%{python3_version_nodots}.so +%{_libdir}/libboost_python%{python3_version_nodots}.so %endif %files random @@ -1174,9 +1308,10 @@ fi %{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever} %{_libdir}/libboost_stacktrace_basic.so.%{sonamever} %{_libdir}/libboost_stacktrace_noop.so.%{sonamever} -%if %{with stacktrace_from_exception} -%{_libdir}/libboost_stacktrace_from_exception.so.%{sonamever} -%endif + +%files system +%license LICENSE_1_0.txt +%{_libdir}/libboost_system.so.%{sonamever} %files thread %license LICENSE_1_0.txt @@ -1190,10 +1325,6 @@ fi %license LICENSE_1_0.txt %{_libdir}/libboost_type_erasure.so.%{sonamever} -%files url -%license LICENSE_1_0.txt -%{_libdir}/libboost_url.so.%{sonamever} - %files wave %license LICENSE_1_0.txt %{_libdir}/libboost_wave.so.%{sonamever} @@ -1211,12 +1342,8 @@ fi %files devel %license LICENSE_1_0.txt %{_includedir}/%{name} -%{_libdir}/cmake %{_libdir}/libboost_atomic.so -%{_libdir}/libboost_charconv.so %{_libdir}/libboost_chrono.so -%{_libdir}/libboost_cobalt.so -%{_libdir}/libboost_cobalt_io.so %{_libdir}/libboost_container.so %{_libdir}/libboost_contract.so %if %{with context} @@ -1230,7 +1357,6 @@ fi %{_libdir}/libboost_filesystem.so %{_libdir}/libboost_graph.so %{_libdir}/libboost_iostreams.so -%{_libdir}/libboost_json.so %{_libdir}/libboost_locale.so %{_libdir}/libboost_log.so %{_libdir}/libboost_log_setup.so @@ -1240,17 +1366,9 @@ fi %{_libdir}/libboost_math_c99.so %{_libdir}/libboost_math_c99f.so %{_libdir}/libboost_math_c99l.so -%{_libdir}/libboost_nowide.so -%if %{with python3} -%{_libdir}/libboost_numpy%{python3_version_nodots}.so -%endif -%{_libdir}/libboost_process.so %{_libdir}/libboost_prg_exec_monitor.so %{_libdir}/libboost_unit_test_framework.so %{_libdir}/libboost_program_options.so -%if %{with python3} -%{_libdir}/libboost_python%{python3_version_nodots}.so -%endif %{_libdir}/libboost_random.so %{_libdir}/libboost_regex.so %{_libdir}/libboost_serialization.so @@ -1258,14 +1376,10 @@ fi %{_libdir}/libboost_stacktrace_addr2line.so %{_libdir}/libboost_stacktrace_basic.so %{_libdir}/libboost_stacktrace_noop.so -%if %{with stacktrace_from_exception} -%{_libdir}/libboost_stacktrace_from_exception.so -%endif %{_libdir}/libboost_system.so %{_libdir}/libboost_thread.so %{_libdir}/libboost_timer.so %{_libdir}/libboost_type_erasure.so -%{_libdir}/libboost_url.so %{_libdir}/libboost_wave.so %files static @@ -1287,11 +1401,21 @@ fi %files openmpi-devel %license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/cmake %{_libdir}/openmpi/lib/libboost_mpi.so -%{_libdir}/openmpi/lib/libboost_graph.so %{_libdir}/openmpi/lib/libboost_graph_parallel.so -%{_libdir}/openmpi/lib/libboost_container.so + +%if %{with python2} + +%files openmpi-python2 +%license LICENSE_1_0.txt +%{_libdir}/openmpi/lib/libboost_mpi_python%{python2_version_nodots}.so.%{sonamever} +%{python2_sitearch}/openmpi/boost/ + +%files openmpi-python2-devel +%license LICENSE_1_0.txt +%{_libdir}/openmpi/lib/libboost_mpi_python%{python2_version_nodots}.so + +%endif %if %{with python3} @@ -1308,9 +1432,7 @@ fi %files graph-openmpi %license LICENSE_1_0.txt -%{_libdir}/openmpi/lib/libboost_graph.so.%{sonamever} %{_libdir}/openmpi/lib/libboost_graph_parallel.so.%{sonamever} -%{_libdir}/openmpi/lib/libboost_container.so.%{sonamever} %endif @@ -1323,11 +1445,21 @@ fi %files mpich-devel %license LICENSE_1_0.txt -%{_libdir}/mpich/lib/cmake %{_libdir}/mpich/lib/libboost_mpi.so -%{_libdir}/mpich/lib/libboost_graph.so %{_libdir}/mpich/lib/libboost_graph_parallel.so -%{_libdir}/mpich/lib/libboost_container.so + +%if %{with python2} + +%files mpich-python2 +%license LICENSE_1_0.txt +%{_libdir}/mpich/lib/libboost_mpi_python%{python2_version_nodots}.so.%{sonamever} +%{python2_sitearch}/mpich/boost/ + +%files mpich-python2-devel +%license LICENSE_1_0.txt +%{_libdir}/mpich/lib/libboost_mpi_python%{python2_version_nodots}.so + +%endif %if %{with python3} @@ -1339,365 +1471,39 @@ fi %files mpich-python3-devel %license LICENSE_1_0.txt %{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so + %endif %files graph-mpich %license LICENSE_1_0.txt -%{_libdir}/mpich/lib/libboost_graph.so.%{sonamever} %{_libdir}/mpich/lib/libboost_graph_parallel.so.%{sonamever} -%{_libdir}/mpich/lib/libboost_container.so.%{sonamever} %endif %files build %license LICENSE_1_0.txt %{_datadir}/%{name}-build/ -%{_datadir}/b2 %files doctools %license LICENSE_1_0.txt %{_bindir}/quickbook %{_datadir}/boostbook/ -%files b2 +%files jam %license LICENSE_1_0.txt -%{_bindir}/b2 -%{_mandir}/man1/b2.1* +%{_bindir}/bjam +%{_mandir}/man1/bjam.1* %changelog -* Thu Jan 15 2026 Yaakov Selkowitz - 1.90.0-4 -- Add dependencies on new subpackages to metapackage - -* Tue Jan 13 2026 Jonathan Wakely - 1.90.0-3 -- Fix libboost_system.so linker script to avoid ldcondig warning - -* Mon Jan 12 2026 Jonathan Wakely - 1.90.0-2 -- Add patch for boost/range/detail/any_iterator_interface.hpp - -* Sat Jan 10 2026 Jonathan Wakely - 1.90.0-1 -- Rebase to 1.90.0 -- See https://fedoraproject.org/wiki/Changes/F44Boost189 -- Drop boost-system subpackage and libboost_thread.so linker script -- Add new boost-charconv, boost-cobalt, and boost-process subpackages - -* Fri Sep 19 2025 Python Maint - 1.83.0-17 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 1.83.0-16 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Tue Aug 05 2025 František Zatloukal - 1.83.0-15 -- Rebuilt for icu 77.1 - -* Wed Jul 23 2025 Fedora Release Engineering - 1.83.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Python Maint - 1.83.0-13 -- Rebuilt for Python 3.14 - -* Sun Jan 26 2025 Wolfgang Stöggl - 1.83.0-12 -- Add boost-1.83-fix-no-member-named_that_error.patch - -* Thu Jan 16 2025 Fedora Release Engineering - 1.83.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Dec 24 2024 Sandro - 1.83.0-10 -- Backport patches for NumPy 2.x - -* Fri Dec 06 2024 Pete Walter - 1.83.0-9 -- Rebuild for ICU 76 - -* Wed Jul 17 2024 Fedora Release Engineering - 1.83.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 08 2024 Python Maint - 1.83.0-7 -- Rebuilt for Python 3.13 - -* Thu Jun 06 2024 Jonathan Wakely - 1.83.0-6 -- Add missing Requires for rpminspect errors. - -* Sun Jun 02 2024 Songsong Zhang - 1.83.0-6 -- Backport patch to fix RISC-V functions missing - -* Sat May 25 2024 Kefu Chai - 1.83.0-5 -- Add patch to fix Boost.Math bug where float_next(+INF) and float_prior(-INF) - returns NaN, but they should return +INF and -INF respectively. - See https://github.com/boostorg/math/issues/1132 and its fix at - -* Sun May 05 2024 Kefu Chai - 1.83.0-4 -- Add patch for Boost.Multiprecision bug - See https://github.com/boostorg/multiprecision/pull/618 - -* Wed Jan 31 2024 Pete Walter - 1.83.0-3 -- Rebuild for ICU 74 - -* Tue Jan 23 2024 Fedora Release Engineering - 1.83.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.83.0-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 06 2023 Patrick Palka - 1.83.0-0 -- Rebase to 1.83.0 -- See https://fedoraproject.org/wiki/Changes/F40Boost183 -- Drop patch for accumulators library that has since been applied upstream. -- Fix spurious Boost.Regex test failures. - -* Sun Oct 29 2023 Orion Poplawski - 1.81.0-10 -- Rebuild for openmpi 5.0.0, drops support for i686 - -* Tue Aug 29 2023 Tom Callaway - 1.81.0-9 -- apply upstream fixes for failing random tests - -* Sun Aug 20 2023 Kefu Chai - 1.81.0-8 -- Add patch for Boost.Accumulators bug - See https://github.com/boostorg/accumulators/pull/54 - -* Wed Aug 2 2023 Tom Callaway - 1.81.0-7 -- add symlink for b2 files - -* Wed Jul 19 2023 Fedora Release Engineering - 1.81.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 František Zatloukal - 1.81.0-5 -- Rebuilt for ICU 73.2 - -* Thu Jul 06 2023 Jonathan Wakely - 1.81.0-4 -- Update License for SPDX migration - -* Tue Jun 13 2023 Python Maint - 1.81.0-3 -- Rebuilt for Python 3.12 - -* Fri May 05 2023 Nianqing Yao - 1.81.0-3 -- Fix build for riscv64 - See https://github.com/fedora-riscv/boost/tree/f38-rv64 - -* Wed Mar 15 2023 Jonathan Wakely - 1.81.0-2 -- Change spec file to use autospec for applying patches - -* Wed Mar 15 2023 Jonathan Wakely - 1.81.0-1 -- Add patch for Boost.Phoenix bugs (#2178210) - -* Mon Feb 20 2023 Thomas Rodgers - 1.81.0-0 -- Rebase to 1.81.0 - See https://fedoraproject.org/wiki/Changes/F38Boost181 -- Drop patches: - deleted: boost-1.58.0-pool.patch - deleted: boost-1.58.0-pool-test_linking.patch - deleted: boost-1.78.0-build-optflags.patch - deleted: boost-1.73-locale-empty-vector.patch - deleted: boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch - deleted: boost-1.76.0-ptr_cont-xml.patch - deleted: boost-1.78.0-fix-b2-staging.patch - deleted: boost-1.76.0-enum_type_object-type-python-3.11.patch -- New Boost.URL runtime component -- boost_build directory is now b2 in upstream, rename to boost_build on install - -* Wed Jan 18 2023 Fedora Release Engineering - 1.78.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Dec 31 2022 Pete Walter - 1.78.0-10 -- Rebuild for ICU 72 - -* Mon Aug 01 2022 Frantisek Zatloukal - 1.78.0-9 -- Rebuilt for ICU 71.1 - -* Wed Jul 20 2022 Fedora Release Engineering - 1.78.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jul 14 2022 Jonathan Wakely - 1.78.0-7 -- Add boost-json to umbrella package - -* Fri Jun 24 2022 Jonathan Wakely - 1.78.0-6 -- Restore Provides for boost-python3-devel (#2100748) - -* Wed Jun 22 2022 Laurent Rineau - 1.78.0-5 -- Fix the CMake config file for openmpi and mpich - -* Tue Jun 21 2022 Jonathan Wakely - 1.78.0-4 -- Remove old Obsoletes tags - -* Tue Jun 14 2022 Python Maint - 1.78.0-3 -- Rebuilt for Python 3.11 - -* Tue Jun 14 2022 Laurent Rineau - 1.78.0-2 -- Re-add the CMake config file provided by Boost - -* Mon Jun 13 2022 Python Maint - 1.78.0-1 -- Rebuilt for Python 3.11 - -* Fri Apr 29 2022 Thomas Rodgers - 1.78.0-0 -- Rebase to 1.78.0 - See https://fedoraproject.org/wiki/Changes/F37Boost178 -- Drop patches: - deleted: boost-1.75.0-build-optflags.patch - deleted: boost-1.75.0-no-rpath.patch - deleted: boost-1.76.0-b2-build-flags.patch - deleted: boost-1.76.0-fix-include-inside-boost-namespace.patch - deleted: boost-1.76.0-fix-duplicate-typedef-in-mp.patch -- Fix silent dropping of some libraries - See https://github.com/bfgroup/b2/pull/113 - -* Wed Apr 27 2022 Thomas Rodgers - 1.76.0-13 -- Add missing boost-1.76.0-enum_type_object-type-python-3.11.patch file - -* Tue Apr 26 2022 Thomas Rodgers - 1.76.0-12 -- Merged https://src.fedoraproject.org/rpms/boost/pull-request/13 (#204336) - -* Tue Apr 26 2022 Thomas Rodgers - 1.76.0-11 -- Add BuildRequires: libzstd-devel to fix (#2042336) - -* Thu Mar 31 2022 Jonathan Wakely - 1.76.0-10 -- Add patch to fix XML validation errors in ptr_container docs - -* Wed Feb 2 2022 Thomas Rodgers - 1.76.0-9 -- Add patch to fix narrowing conversions on ppc64le - https://github.com/boostorg/interval/issues/29 - -* Tue Feb 1 2022 Laurent Rineau - 1.76.0-8 -- Add patch to fix Boost Multiprecision on ppc64le - https://github.com/boostorg/multiprecision/issues/419 -- Acknowledge the change of the ABI of ppc64le with long double. - -* Wed Jan 19 2022 Fedora Release Engineering - 1.76.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Sep 01 2021 Jonathan Wakely - 1.76.0-6 -- Add patch to fix CI failure - -* Wed Sep 01 2021 Jonathan Wakely - 1.76.0-5 -- Make boost-python3 depend on specific 3.X version (#1896713) - -* Thu Aug 05 2021 Thomas Rodgers - 1.76.0-4 -- Third attempt at making the long double c99 and tr1 math libs conditional - on ppc64le - -* Thu Aug 05 2021 Thomas Rodgers - 1.76.0-3 -- Second attempt at making the long double c99 and tr1 math libs conditional - on ppc64le - -* Thu Aug 05 2021 Thomas Rodgers - 1.76.0-2 -- Boost.Math does not support 'long double' of ppc64le - See https://github.com/boostorg/math/pull/524 - -* Wed Aug 04 2021 Thomas Rodgers - 1.76.0-1 -- Rebase to 1.75.0 - See https://fedoraproject.org/wiki/Changes/F35Boost176 -- Drop patches: - deleted: boost-1.73-python3.10.patch - deleted: boost-1.73.0-b2-build-flags.patch - deleted: boost-1.75.0-boost-build-fix.patch -- Fix include inside boost namespace in boost/math/tools/mp.hpp - See https://github.com/boostorg/math/pull/670 -- Fix duplicate typedef in boost/math/tools/mp.hpp - See https://github.com/boostorg/math/pull/671 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.75.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.75.0-8 -- Rebuilt for Python 3.10 - -* Wed May 19 2021 Pete Walter - 1.75.0-7 -- Rebuild for ICU 69 - -* Wed May 19 2021 Pete Walter - 1.75.0-6 -- Rebuild for ICU 69 - -* Fri May 07 2021 Thomas Rodgers - 1.75.0-5 -- Patch to fix deprecated iterator warnings (#1958382) - -* Tue Mar 30 2021 Jonathan Wakely - 1.75.0-4 -- Rebuilt for removed libstdc++ symbol (#1937698) - -* Tue Feb 02 2021 Thomas Rodgers - 1.75.0-3 -- Patch Boost.Build to find boost-build.jam (#1923740) - -* Tue Jan 26 2021 Fedora Release Engineering - 1.75.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 11 2021 Thomas Rodgers - 1.75.0-1 -- Rebase to 1.75.0 -- Add boost-json subpackage - -* Fri Jan 8 14:14:00 CET 2021 Tomas Hrnciar - 1.73.0-12 -- Patch Boost.Python for Python 3.10 - replace _Py_fopen() with fopen() (#1912903) - -* Fri Nov 20 2020 Jonathan Wakely - 1.73.0-11 -- Patch Boost.Locale to not access empty vector (#1899888) - -* Fri Nov 13 2020 Jonathan Wakely - 1.73.0-10 -- Patch Boost.Python for Python 3.10 changes (#1896382) - -* Wed Nov 04 2020 Jonathan Wakely - 1.73.0-9 -- Remove incorrect dependency on xz, only the shared lib is needed - -* Fri Oct 30 2020 Jonathan Wakely - 1.73.0-8 -- Build Boost.Iostreams with LZMA support (#1893060) - -* Sat Aug 01 2020 Fedora Release Engineering - 1.73.0-7 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.73.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jun 11 2020 Jonathan Wakely - 1.73.0-5 -- Add patch for Boost.MPI to fix espresso (#1843105) - -* Fri Jun 05 2020 Jonathan Wakely - 1.73.0-4 -- Add patch for Boost.Geometry issue #721 - -* Fri May 29 2020 Jonathan Wakely - 1.73.0-3 -- Rebuilt for Python 3.9 - -* Thu May 28 2020 Jonathan Wakely - 1.73.0-1 -- Rebase to 1.73.0 -- Replace boost-jam and bjam with boost-b2 and b2 -- Add boost-nowide subpackage - -* Mon May 25 2020 Miro Hrončok - 1.69.0-22 -- Rebuilt for Python 3.9 - -* Sat May 23 2020 Igor Raits - 1.69.0-21 -- Add Provides for boost-python3-devel - -* Fri May 22 2020 Jonathan Wakely - 1.69.0-20 -- Require boost-python3 for boost, fold boost-python3-devel into boost-devel -- Do not link Python extensions to libpython - -* Fri May 15 2020 Pete Walter - 1.69.0-19 -- Rebuild for ICU 67 - -* Tue May 12 2020 Avi Kivity - 1.69.0-18 +* Tue May 12 2020 Avi Kivity - 1.69.0-12 - Add patch for C++20 compatibility in Boost.Signals2 (#1834764) -* Mon May 11 2020 Jonathan Wakely - 1.69.0-17 +* Mon May 11 2020 Jonathan Wakely - 1.69.0-11 - Add patch for C++20 compatibility in Boost.Test (#1832639) -* Thu Apr 02 2020 Jonathan Wakely - 1.69.0-16 -- Drop boost-1.57.0-mpl-print.patch patch that doesn't work -- Remove vestigial parts of separate python2/python3 build -- Generate version_enc automatically from version and drop version_suffix - -* Mon Mar 30 2020 Jonathan Wakely - 1.69.0-15 +* Mon Mar 30 2020 Jonathan Wakely - 1.69.0-10 - Patch Boost.Format for C++20 compatibility with GCC 10 (#1818723) -* Tue Jan 28 2020 Fedora Release Engineering - 1.69.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 15 2019 Denis Arnaud - 1.69.0-13 -- Removed the Python2 sub-packages - -* Fri Nov 01 2019 Pete Walter - 1.69.0-12 -- Rebuild for ICU 65 - -* Thu Oct 03 2019 Miro Hrončok - 1.69.0-11 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Sun Aug 18 2019 Miro Hrončok - 1.69.0-10 -- Rebuilt for Python 3.8 - * Wed Jul 24 2019 Fedora Release Engineering - 1.69.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -1724,7 +1530,7 @@ fi * Sat Dec 15 2018 Denis Arnaud - 1.69.0-1 - Rebase to 1.69.0 -- Dropped library: Boost.Signals (now replaced by header-only Boost.Signals2) +- Dropped library: Boost.Signals (now replaced by header-only Boost.Signlas2) * Sat Dec 01 2018 Denis Arnaud - 1.68.0-1 - Rebase to 1.68.0 @@ -2576,7 +2382,7 @@ fi - Drop obsolete Obsoletes: boost-python and boost-doc <= 1.30.2 * Tue Jan 12 2010 Benjamin Kosnik - 1.41.0-1 -- Don't package generated debug libs, even with +- Don't package generated debug libs, even with (-DCMAKE_BUILD_TYPE=RelWithDebInfo | Release). - Update and include boost-cmake-soname.patch. - Uncomment ctest. diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 4581d72..0000000 --- a/gating.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional} ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional} diff --git a/libboost_thread.so b/libboost_thread.so new file mode 100644 index 0000000..db50610 --- /dev/null +++ b/libboost_thread.so @@ -0,0 +1,21 @@ +changequote(`[', `]')dnl +/* GNU ld script + + Boost.Thread header files pull in enough of Boost.System that + symbols from the latter library are referenced by a compiled object + that includes Boost.Thread headers. libboost_system-mt.so is among + libboost_thread-mt.so's DT_NEEDED, but program linker requires that + missing symbols are satisfied by direct dependency, not by a + transitive one. Hence this linker script, which brings in the + Boost.System DSO. */ + +INPUT(libboost_thread.so.VERSION) +INPUT(libboost_system.so.VERSION) +ifdef([HAS_ATOMIC_FLAG_LOCKFREE],[], +[ +/* If the given architecture doesn't have lock-free implementation of + boost::atomic_flag, the dependency on Boost.Atomic may leak from + the header files to client binaries. */ + +INPUT(libboost_atomic.so.VERSION) +])dnl diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 3fd3ab7..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 17c9198..cead2dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (boost_1_90_0.tar.bz2) = 1c81b60f63367d7249f277f0a569c181926dcf5a725e30433dd336205f1782880489dd00df6a1a74fd107765d3ca2cd49f806788cabb7d5700a8a55927a9a199 +SHA512 (boost_1_69_0.tar.bz2) = d0e9bb858c44880d56c0291afef6a1b011a62f659a2d8f58dcb6147ea0899f9157bd8db3097896618fee0116847ebeac78b6d0f0fec8a92c3469500828bbe552 diff --git a/tests/boost-testsuite-sanity/Makefile b/tests/boost-testsuite-sanity/Makefile deleted file mode 100644 index e1d5f40..0000000 --- a/tests/boost-testsuite-sanity/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/boost/Sanity/boost-testsuite-sanity -# Description: boost testing by upstream testsuite -# Author: Michal Kolar -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/tools/boost/Sanity/boost-testsuite-sanity -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE tests - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Michal Kolar " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: boost testing by upstream testsuite" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 1h" >> $(METADATA) - @echo "RunFor: boost" >> $(METADATA) - @echo "Requires: boost dnf-utils rpm-build boost-b2" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RHEL8" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/boost-testsuite-sanity/PURPOSE b/tests/boost-testsuite-sanity/PURPOSE deleted file mode 100644 index 695d634..0000000 --- a/tests/boost-testsuite-sanity/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/boost/Sanity/boost-testsuite-sanity -Description: boost testing by upstream testsuite -Author: Michal Kolar diff --git a/tests/boost-testsuite-sanity/main.fmf b/tests/boost-testsuite-sanity/main.fmf deleted file mode 100644 index e751d7c..0000000 --- a/tests/boost-testsuite-sanity/main.fmf +++ /dev/null @@ -1,16 +0,0 @@ -summary: boost testing by upstream testsuite -description: '' -contact: -- Michal Kolar -component: -- boost -test: ./runtest.sh -framework: beakerlib -recommend: -- boost -- dnf-utils -- rpm-build -- boost-b2 -duration: 1h -extra-summary: /tools/boost/Sanity/boost-testsuite-sanity -extra-task: /tools/boost/Sanity/boost-testsuite-sanity diff --git a/tests/boost-testsuite-sanity/runtest.sh b/tests/boost-testsuite-sanity/runtest.sh deleted file mode 100755 index 2bc6957..0000000 --- a/tests/boost-testsuite-sanity/runtest.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/boost/Sanity/boost-testsuite-sanity -# Description: boost testing by upstream testsuite -# Author: Michal Kolar -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -BUILD_USER=${BUILD_USER:-bstbld} -TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-100} -PACKAGE="boost" -REQUIRES="$PACKAGE rpm-build boost-b2" -if rlIsFedora; then - REQUIRES="$REQUIRES dnf-utils" -else - REQUIRES="$REQUIRES yum-utils" -fi - -rlJournalStart - rlPhaseStartSetup - rlShowRunningKernel - rlAssertRpm --all - rlRun "TmpDir=`mktemp -d /home/boost.XXXXXXXXXX`" # work in /home due to high demands on disk space - rlRun "cp tests $TmpDir" - rlRun "pushd $TmpDir" - rlFetchSrcForInstalled $PACKAGE - rlRun "useradd -M -N $BUILD_USER" 0,9 - [ "$?" == "0" ] && rlRun "del=yes" - rlRun "chown -R $BUILD_USER:users $TmpDir" - rlPhaseEnd - - rlPhaseStartSetup "build boost" - rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm" - rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" - rlRun "sed -i -e 's/^%prep/%prep\n%dump/' $TmpDir/SPECS/*.spec" - rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" - rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "toplev_dirname=`awk '/toplev_dirname/{print $3; exit}' $TmpDir/rpmbuild.log`" - cd $TmpDir/BUILD/$toplev_dirname - if [ $? -ne 0 ]; then - # handle rpm 4.20 build directory difference - # https://github.com/rpm-software-management/rpm/issues/3147 - rlRun "cd $TmpDir/BUILD/*-build/$toplev_dirname" - fi - # now we know the top-level build dir, keep it for later - rlRun "BuildDir=$(pwd)" - rlRun "su -c './bootstrap.sh &>$TmpDir/bootstrap.log' $BUILD_USER" - rlRun "rlFileSubmit $TmpDir/bootstrap.log" - rlPhaseEnd - - rlPhaseStartTest "run testsuite" - while read test_path; do - if [ -f $BuildDir/libs/$test_path/test/Jamfile* ]; then - rlRun "cd $BuildDir/libs/$test_path/test" - rlRun "su -c '/usr/bin/b2 -d1 --build-dir=$TmpDir/test-build &>>$TmpDir/testsuite.log' $BUILD_USER" - rm -fr $TmpDir/test-build - else - rlLogInfo "$test_path/Jamfile* not found, skipping" - fi - done <$TmpDir/tests - rlRun "rlFileSubmit $TmpDir/testsuite.log" - rlPhaseEnd - - rlPhaseStartTest "evaluate results" - rlRun "cd $TmpDir" - rlRun "grep -E '\.\.\.failed .+$TmpDir/test-build' testsuite.log" 1 "There should be no failure" - rlRun "tests_count=\$(grep -E '\*\*passed\*\*.+$TmpDir/test-build' testsuite.log | wc -l)" - [ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" - [ "$del" == "yes" ] && rlRun "userdel $BUILD_USER" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/boost-testsuite-sanity/tests b/tests/boost-testsuite-sanity/tests deleted file mode 100644 index d360dbd..0000000 --- a/tests/boost-testsuite-sanity/tests +++ /dev/null @@ -1,5 +0,0 @@ -integer -random -rational -regex -timer