Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
d9e1272e57 |
32 changed files with 2588 additions and 936 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
22
boost-1.50.0-fix-non-utf8-files.patch
Normal file
22
boost-1.50.0-fix-non-utf8-files.patch
Normal file
|
|
@ -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<thing_base_unit, boost::units::
|
||||
struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
|
||||
{
|
||||
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<euro_base_unit::unit_type> 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;
|
||||
30
boost-1.58.0-pool-test_linking.patch
Normal file
30
boost-1.58.0-pool-test_linking.patch
Normal file
|
|
@ -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 : : : <toolset>msvc:<cxxflags>-wd4267 ]
|
||||
- [ run test_pool_alloc.cpp ]
|
||||
- [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 ]
|
||||
- [ run test_msvc_mem_leak_detect.cpp ]
|
||||
- [ run test_bug_3349.cpp ]
|
||||
- [ run test_bug_4960.cpp ]
|
||||
+ [ run test_simple_seg_storage.cpp : : : <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
|
||||
+ [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run pool_msvc_compiler_bug_test.cpp : : : <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
|
||||
+ [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
|
||||
[ run test_bug_1252.cpp : : :
|
||||
<toolset>clang:<cxxflags>-Wno-c++11-long-long
|
||||
<toolset>gcc:<cxxflags>-Wno-long-long
|
||||
- <toolset>pathscale:<cxxflags>-Wno-long-long ]
|
||||
- [ run test_bug_2696.cpp ]
|
||||
- [ run test_bug_5526.cpp ]
|
||||
+ <toolset>pathscale:<cxxflags>-Wno-long-long <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
|
||||
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
|
||||
[ compile test_poisoned_macros.cpp ]
|
||||
;
|
||||
120
boost-1.58.0-pool.patch
Normal file
120
boost-1.58.0-pool.patch
Normal file
|
|
@ -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 <boost/pool/poolfwd.hpp>
|
||||
|
||||
+// std::numeric_limits
|
||||
+#include <boost/limits.hpp>
|
||||
// boost::integer::static_lcm
|
||||
#include <boost/integer/common_factor_ct.hpp>
|
||||
@@ -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<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
|
||||
+ return (std::numeric_limits<size_type>::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 <boost/pool/object_pool.hpp>
|
||||
+#include <boost/limits.hpp>
|
||||
+
|
||||
+int main()
|
||||
+{
|
||||
+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
|
||||
+
|
||||
+ void *x = p.malloc();
|
||||
+ BOOST_ASSERT(!x);
|
||||
+
|
||||
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
|
||||
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
|
||||
+
|
||||
+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
|
||||
+ BOOST_ASSERT(!y);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
20
boost-1.66.0-no-rpath.patch
Normal file
20
boost-1.66.0-no-rpath.patch
Normal file
|
|
@ -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)
|
||||
}
|
||||
|
||||
###
|
||||
28
boost-1.69-format-allocator.patch
Normal file
28
boost-1.69-format-allocator.patch
Normal file
|
|
@ -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<Ch *>(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<compat_allocator_type>::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<Ch *>(vdptr);
|
||||
-#else
|
||||
+#elif defined BOOST_NO_CXX11_ALLOCATOR
|
||||
newptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0);
|
||||
+#else
|
||||
+ newptr = std::allocator_traits<compat_allocator_type>::allocate(alloc_,
|
||||
+ new_size, is_allocated_? oldptr : 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
27
boost-1.69.0-test-cxx20.patch
Normal file
27
boost-1.69.0-test-cxx20.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
From db6b98c72783351e0acd3c558691323a7a103ba9 Mon Sep 17 00:00:00 2001
|
||||
From: Raffi Enficiaud <raffi.enficiaud@mines-paris.org>
|
||||
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<char const*>::operator()( std::ostream& ostr, char const* t )
|
||||
void
|
||||
print_log_value<wchar_t const*>::operator()( std::ostream& ostr, wchar_t const* t )
|
||||
{
|
||||
- ostr << ( t ? reinterpret_cast<const void*>(t) : "null string" );
|
||||
+ if(t) {
|
||||
+ ostr << static_cast<const void*>(t);
|
||||
+ }
|
||||
+ else {
|
||||
+ ostr << "null w-string";
|
||||
+ }
|
||||
}
|
||||
|
||||
//____________________________________________________________________________//
|
||||
23
boost-1.73-geometry-issue721.patch
Normal file
23
boost-1.73-geometry-issue721.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Wakely <boost@kayari.org>
|
||||
Date: Fri, 5 Jun 2020 19:29:27 +0100
|
||||
Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public
|
||||
|
||||
Fixes #721
|
||||
---
|
||||
include/boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/boost/geometry/index/detail/rtree/visitors/insert.hpp b/include/boost/geometry/index/detail/rtree/visitors/insert.hpp
|
||||
index 2d324cb7f4..5709a930cc 100644
|
||||
--- a/boost/geometry/index/detail/rtree/visitors/insert.hpp
|
||||
+++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp
|
||||
@@ -265,7 +265,7 @@ struct insert_traverse_data
|
||||
// Default insert visitor
|
||||
template <typename Element, typename MembersHolder>
|
||||
class insert
|
||||
- : MembersHolder::visitor
|
||||
+ : public MembersHolder::visitor
|
||||
{
|
||||
protected:
|
||||
typedef typename MembersHolder::box_type box_type;
|
||||
37
boost-1.73-locale-empty-vector.patch
Normal file
37
boost-1.73-locale-empty-vector.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
From daf4ef50c88c2b9a6bf2c40b537eebc202caad6e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?S=C3=A9bastien=20Gonzalve?=
|
||||
<sebastien.gonzalve@aliceadsl.fr>
|
||||
Date: Sat, 14 Nov 2020 10:39:47 +0100
|
||||
Subject: [PATCH] Do not try to access element when vector is empty
|
||||
|
||||
Trying to access tmp[0] causes a crash on Fedora when assertion on STL
|
||||
are enabled.
|
||||
|
||||
/usr/include/c++/10/bits/stl_vector.h:1045: std::vector<_Tp, _Alloc>::reference std::vector<_Tp, _Alloc>::operator[](std::vector<_Tp, _Alloc>::size_type) [with _Tp = unsigned char; _Alloc = std::allocator<unsigned char>; std::vector<_Tp, _Alloc>::reference = unsigned char&; std::vector<_Tp, _Alloc>::size_type = long unsigned int]: Assertion '__builtin_expect(__n < this->size(), true)' failed.
|
||||
|
||||
This patch just passes nullptr as pointer to getSortKey() when tmp size
|
||||
is 0, preventing dereferencing elements in empty vector.
|
||||
|
||||
I guess that &tmp[0] should be optimized as 'no real access' when
|
||||
disabling assertion, but actually leads to crash when assert are
|
||||
enabled.
|
||||
---
|
||||
src/icu/collator.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libs/locale/src/icu/collator.cpp b/libs/locale/src/icu/collator.cpp
|
||||
index 7f1ea6a..dc59e8c 100644
|
||||
--- a/libs/locale/src/icu/collator.cpp
|
||||
+++ b/libs/locale/src/icu/collator.cpp
|
||||
@@ -93,7 +93,7 @@ namespace boost {
|
||||
std::vector<uint8_t> tmp;
|
||||
tmp.resize(str.length());
|
||||
icu::Collator *collate = get_collator(level);
|
||||
- int len = collate->getSortKey(str,&tmp[0],tmp.size());
|
||||
+ int len = collate->getSortKey(str,tmp.empty()?nullptr:&tmp[0],tmp.size());
|
||||
if(len > int(tmp.size())) {
|
||||
tmp.resize(len);
|
||||
collate->getSortKey(str,&tmp[0],tmp.size());
|
||||
--
|
||||
2.26.2
|
||||
|
||||
534
boost-1.73-mpi-vector-data.patch
Normal file
534
boost-1.73-mpi-vector-data.patch
Normal file
|
|
@ -0,0 +1,534 @@
|
|||
From 28a73eac54fbc7cfebfd3b2231ee607284233a00 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weik <fweik@icp.uni-stuttgart.de>
|
||||
Date: Wed, 10 Jun 2020 10:18:21 +0200
|
||||
Subject: [PATCH 1/4] fixed ub access to first element of empty vectors
|
||||
|
||||
---
|
||||
include/boost/mpi/collectives/all_reduce.hpp | 2 +-
|
||||
include/boost/mpi/collectives/all_to_all.hpp | 12 ++++++------
|
||||
include/boost/mpi/collectives/gatherv.hpp | 8 ++++----
|
||||
include/boost/mpi/collectives/reduce.hpp | 4 ++--
|
||||
include/boost/mpi/collectives/scatter.hpp | 2 +-
|
||||
include/boost/mpi/collectives/scatterv.hpp | 4 ++--
|
||||
.../mpi/detail/binary_buffer_iprimitive.hpp | 4 ++--
|
||||
.../mpi/detail/binary_buffer_oprimitive.hpp | 2 +-
|
||||
.../mpi/detail/mpi_datatype_primitive.hpp | 2 +-
|
||||
include/boost/mpi/detail/packed_iprimitive.hpp | 4 ++--
|
||||
include/boost/mpi/detail/packed_oprimitive.hpp | 4 ++--
|
||||
include/boost/mpi/detail/request_handlers.hpp | 4 ++--
|
||||
include/boost/mpi/graph_communicator.hpp | 4 ++--
|
||||
include/boost/mpi/group.hpp | 9 +++++----
|
||||
include/boost/mpi/nonblocking.hpp | 18 +++++++++---------
|
||||
src/cartesian_communicator.cpp | 3 ++-
|
||||
16 files changed, 44 insertions(+), 42 deletions(-)
|
||||
|
||||
diff --git a/include/boost/mpi/collectives/all_reduce.hpp b/include/boost/mpi/collectives/all_reduce.hpp
|
||||
index e6ce93c8..302430ff 100644
|
||||
--- a/boost/mpi/collectives/all_reduce.hpp
|
||||
+++ b/boost/mpi/collectives/all_reduce.hpp
|
||||
@@ -77,7 +77,7 @@ namespace detail {
|
||||
// implementation in this case.
|
||||
// it's not clear how/if we can avoid the copy.
|
||||
std::vector<T> tmp_in( out_values, out_values + n);
|
||||
- reduce(comm, &(tmp_in[0]), n, out_values, op, 0);
|
||||
+ reduce(comm, detail::c_data(tmp_in), n, out_values, op, 0);
|
||||
} else {
|
||||
reduce(comm, in_values, n, out_values, op, 0);
|
||||
}
|
||||
diff --git a/include/boost/mpi/collectives/all_to_all.hpp b/include/boost/mpi/collectives/all_to_all.hpp
|
||||
index 4f20be73..a0af5ff3 100644
|
||||
--- a/boost/mpi/collectives/all_to_all.hpp
|
||||
+++ b/boost/mpi/collectives/all_to_all.hpp
|
||||
@@ -91,10 +91,10 @@ namespace detail {
|
||||
|
||||
// Transmit the actual data
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Alltoallv,
|
||||
- (&outgoing[0], &send_sizes[0],
|
||||
- &send_disps[0], MPI_PACKED,
|
||||
- &incoming[0], &recv_sizes[0],
|
||||
- &recv_disps[0], MPI_PACKED,
|
||||
+ (detail::c_data(outgoing), detail::c_data(send_sizes),
|
||||
+ detail::c_data(send_disps), MPI_PACKED,
|
||||
+ detail::c_data(incoming), detail::c_data(recv_sizes),
|
||||
+ detail::c_data(recv_disps), MPI_PACKED,
|
||||
comm));
|
||||
|
||||
// Deserialize data from the iarchive
|
||||
@@ -126,7 +126,7 @@ all_to_all(const communicator& comm, const std::vector<T>& in_values,
|
||||
{
|
||||
BOOST_ASSERT((int)in_values.size() == comm.size());
|
||||
out_values.resize(comm.size());
|
||||
- ::boost::mpi::all_to_all(comm, &in_values[0], &out_values[0]);
|
||||
+ ::boost::mpi::all_to_all(comm, detail::c_data(in_values), detail::c_data(out_values));
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
@@ -143,7 +143,7 @@ all_to_all(const communicator& comm, const std::vector<T>& in_values, int n,
|
||||
{
|
||||
BOOST_ASSERT((int)in_values.size() == comm.size() * n);
|
||||
out_values.resize(comm.size() * n);
|
||||
- ::boost::mpi::all_to_all(comm, &in_values[0], n, &out_values[0]);
|
||||
+ ::boost::mpi::all_to_all(comm, detail::c_data(in_values), n, detail::c_data(out_values));
|
||||
}
|
||||
|
||||
} } // end namespace boost::mpi
|
||||
diff --git a/include/boost/mpi/collectives/gatherv.hpp b/include/boost/mpi/collectives/gatherv.hpp
|
||||
index 6b8d706f..5fae9942 100644
|
||||
--- a/boost/mpi/collectives/gatherv.hpp
|
||||
+++ b/boost/mpi/collectives/gatherv.hpp
|
||||
@@ -87,7 +87,7 @@ gatherv(const communicator& comm, const T* in_values, int in_size,
|
||||
{
|
||||
if (comm.rank() == root)
|
||||
detail::gatherv_impl(comm, in_values, in_size,
|
||||
- out_values, &sizes[0], &displs[0],
|
||||
+ out_values, detail::c_data(sizes), detail::c_data(displs),
|
||||
root, is_mpi_datatype<T>());
|
||||
else
|
||||
detail::gatherv_impl(comm, in_values, in_size, root, is_mpi_datatype<T>());
|
||||
@@ -99,7 +99,7 @@ gatherv(const communicator& comm, const std::vector<T>& in_values,
|
||||
T* out_values, const std::vector<int>& sizes, const std::vector<int>& displs,
|
||||
int root)
|
||||
{
|
||||
- ::boost::mpi::gatherv(comm, &in_values[0], in_values.size(), out_values, sizes, displs, root);
|
||||
+ ::boost::mpi::gatherv(comm, detail::c_data(in_values), in_values.size(), out_values, sizes, displs, root);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
@@ -113,7 +113,7 @@ template<typename T>
|
||||
void gatherv(const communicator& comm, const std::vector<T>& in_values, int root)
|
||||
{
|
||||
BOOST_ASSERT(comm.rank() != root);
|
||||
- detail::gatherv_impl(comm, &in_values[0], in_values.size(), root, is_mpi_datatype<T>());
|
||||
+ detail::gatherv_impl(comm, detail::c_data(in_values), in_values.size(), root, is_mpi_datatype<T>());
|
||||
}
|
||||
|
||||
///////////////////////
|
||||
@@ -139,7 +139,7 @@ void
|
||||
gatherv(const communicator& comm, const std::vector<T>& in_values,
|
||||
T* out_values, const std::vector<int>& sizes, int root)
|
||||
{
|
||||
- ::boost::mpi::gatherv(comm, &in_values[0], in_values.size(), out_values, sizes, root);
|
||||
+ ::boost::mpi::gatherv(comm, detail::c_data(in_values), in_values.size(), out_values, sizes, root);
|
||||
}
|
||||
|
||||
} } // end namespace boost::mpi
|
||||
diff --git a/include/boost/mpi/collectives/reduce.hpp b/include/boost/mpi/collectives/reduce.hpp
|
||||
index 3248e324..76a28212 100644
|
||||
--- a/boost/mpi/collectives/reduce.hpp
|
||||
+++ b/boost/mpi/collectives/reduce.hpp
|
||||
@@ -335,7 +335,7 @@ void
|
||||
reduce(const communicator & comm, std::vector<T> const & in_values, Op op,
|
||||
int root)
|
||||
{
|
||||
- reduce(comm, &in_values.front(), in_values.size(), op, root);
|
||||
+ reduce(comm, detail::c_data(in_values), in_values.size(), op, root);
|
||||
}
|
||||
|
||||
template<typename T, typename Op>
|
||||
@@ -344,7 +344,7 @@ reduce(const communicator & comm, std::vector<T> const & in_values,
|
||||
std::vector<T> & out_values, Op op, int root)
|
||||
{
|
||||
if (root == comm.rank()) out_values.resize(in_values.size());
|
||||
- reduce(comm, &in_values.front(), in_values.size(), &out_values.front(), op,
|
||||
+ reduce(comm, detail::c_data(in_values), in_values.size(), detail::c_data(out_values), op,
|
||||
root);
|
||||
}
|
||||
|
||||
diff --git a/include/boost/mpi/collectives/scatter.hpp b/include/boost/mpi/collectives/scatter.hpp
|
||||
index ae3adcbc..f967060a 100644
|
||||
--- a/boost/mpi/collectives/scatter.hpp
|
||||
+++ b/boost/mpi/collectives/scatter.hpp
|
||||
@@ -188,7 +188,7 @@ void
|
||||
scatter(const communicator& comm, const std::vector<T>& in_values,
|
||||
T* out_values, int n, int root)
|
||||
{
|
||||
- ::boost::mpi::scatter(comm, &in_values[0], out_values, n, root);
|
||||
+ ::boost::mpi::scatter(comm, detail::c_data(in_values), out_values, n, root);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
diff --git a/include/boost/mpi/collectives/scatterv.hpp b/include/boost/mpi/collectives/scatterv.hpp
|
||||
index f53f704b..7f2fd129 100644
|
||||
--- a/boost/mpi/collectives/scatterv.hpp
|
||||
+++ b/boost/mpi/collectives/scatterv.hpp
|
||||
@@ -142,7 +142,7 @@ void
|
||||
scatterv(const communicator& comm, const std::vector<T>& in_values,
|
||||
const std::vector<int>& sizes, T* out_values, int root)
|
||||
{
|
||||
- ::boost::mpi::scatterv(comm, &in_values[0], sizes, out_values, root);
|
||||
+ ::boost::mpi::scatterv(comm, detail::c_data(in_values), sizes, out_values, root);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
@@ -159,7 +159,7 @@ void
|
||||
scatterv(const communicator& comm, const std::vector<T>& in_values,
|
||||
T* out_values, int out_size, int root)
|
||||
{
|
||||
- ::boost::mpi::scatterv(comm, &in_values[0], out_values, out_size, root);
|
||||
+ ::boost::mpi::scatterv(comm, detail::c_data(in_values), out_values, out_size, root);
|
||||
}
|
||||
|
||||
} } // end namespace boost::mpi
|
||||
diff --git a/include/boost/mpi/detail/binary_buffer_iprimitive.hpp b/include/boost/mpi/detail/binary_buffer_iprimitive.hpp
|
||||
index 388cd44c..087d8529 100644
|
||||
--- a/boost/mpi/detail/binary_buffer_iprimitive.hpp
|
||||
+++ b/boost/mpi/detail/binary_buffer_iprimitive.hpp
|
||||
@@ -41,12 +41,12 @@ class BOOST_MPI_DECL binary_buffer_iprimitive
|
||||
|
||||
void* address ()
|
||||
{
|
||||
- return &buffer_.front();
|
||||
+ return detail::c_data(buffer_);
|
||||
}
|
||||
|
||||
void const* address () const
|
||||
{
|
||||
- return &buffer_.front();
|
||||
+ return detail::c_data(buffer_);
|
||||
}
|
||||
|
||||
const std::size_t& size() const
|
||||
diff --git a/include/boost/mpi/detail/binary_buffer_oprimitive.hpp b/include/boost/mpi/detail/binary_buffer_oprimitive.hpp
|
||||
index 313097b7..fa0645d7 100644
|
||||
--- a/boost/mpi/detail/binary_buffer_oprimitive.hpp
|
||||
+++ b/boost/mpi/detail/binary_buffer_oprimitive.hpp
|
||||
@@ -40,7 +40,7 @@ class BOOST_MPI_DECL binary_buffer_oprimitive
|
||||
|
||||
void const * address() const
|
||||
{
|
||||
- return &buffer_.front();
|
||||
+ return detail::c_data(buffer_);
|
||||
}
|
||||
|
||||
const std::size_t& size() const
|
||||
diff --git a/include/boost/mpi/detail/mpi_datatype_primitive.hpp b/include/boost/mpi/detail/mpi_datatype_primitive.hpp
|
||||
index fc05d786..5b3cdf54 100644
|
||||
--- a/boost/mpi/detail/mpi_datatype_primitive.hpp
|
||||
+++ b/boost/mpi/detail/mpi_datatype_primitive.hpp
|
||||
@@ -133,7 +133,7 @@ class mpi_datatype_primitive
|
||||
template <class T>
|
||||
static T* get_data(std::vector<T>& v)
|
||||
{
|
||||
- return v.empty() ? 0 : &(v[0]);
|
||||
+ return detail::c_data(v);
|
||||
}
|
||||
|
||||
std::vector<MPI_Aint> addresses;
|
||||
diff --git a/include/boost/mpi/detail/packed_iprimitive.hpp b/include/boost/mpi/detail/packed_iprimitive.hpp
|
||||
index 85a4010f..e402a20a 100644
|
||||
--- a/boost/mpi/detail/packed_iprimitive.hpp
|
||||
+++ b/boost/mpi/detail/packed_iprimitive.hpp
|
||||
@@ -39,12 +39,12 @@ class BOOST_MPI_DECL packed_iprimitive
|
||||
|
||||
void* address ()
|
||||
{
|
||||
- return &buffer_[0];
|
||||
+ return detail::c_data(buffer_);
|
||||
}
|
||||
|
||||
void const* address () const
|
||||
{
|
||||
- return &buffer_[0];
|
||||
+ return detail::c_data(buffer_);
|
||||
}
|
||||
|
||||
const std::size_t& size() const
|
||||
diff --git a/include/boost/mpi/detail/packed_oprimitive.hpp b/include/boost/mpi/detail/packed_oprimitive.hpp
|
||||
index 4ca8e072..c9ce44dc 100644
|
||||
--- a/boost/mpi/detail/packed_oprimitive.hpp
|
||||
+++ b/boost/mpi/detail/packed_oprimitive.hpp
|
||||
@@ -38,7 +38,7 @@ class BOOST_MPI_DECL packed_oprimitive
|
||||
|
||||
void const * address() const
|
||||
{
|
||||
- return &buffer_[0];
|
||||
+ return detail::c_data(buffer_);
|
||||
}
|
||||
|
||||
const std::size_t& size() const
|
||||
@@ -114,7 +114,7 @@ class BOOST_MPI_DECL packed_oprimitive
|
||||
|
||||
static buffer_type::value_type* get_data(buffer_type& b)
|
||||
{
|
||||
- return b.empty() ? 0 : &(b[0]);
|
||||
+ return detail::c_data(b);
|
||||
}
|
||||
|
||||
buffer_type& buffer_;
|
||||
diff --git a/include/boost/mpi/detail/request_handlers.hpp b/include/boost/mpi/detail/request_handlers.hpp
|
||||
index 50a22ec3..8283918b 100644
|
||||
--- a/boost/mpi/detail/request_handlers.hpp
|
||||
+++ b/boost/mpi/detail/request_handlers.hpp
|
||||
@@ -456,7 +456,7 @@ class request::legacy_dynamic_primitive_array_handler
|
||||
// Resize our buffer and get ready to receive its data
|
||||
this->extra::m_values.resize(this->extra::m_count);
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Irecv,
|
||||
- (&(this->extra::m_values[0]), this->extra::m_values.size(), get_mpi_datatype<T>(),
|
||||
+ (detail::c_data(this->extra::m_values), this->extra::m_values.size(), get_mpi_datatype<T>(),
|
||||
stat.source(), stat.tag(),
|
||||
MPI_Comm(m_comm), m_requests + 1));
|
||||
}
|
||||
@@ -478,7 +478,7 @@ class request::legacy_dynamic_primitive_array_handler
|
||||
// Resize our buffer and get ready to receive its data
|
||||
this->extra::m_values.resize(this->extra::m_count);
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Irecv,
|
||||
- (&(this->extra::m_values[0]), this->extra::m_values.size(), get_mpi_datatype<T>(),
|
||||
+ (detail::c_data(this->extra::m_values), this->extra::m_values.size(), get_mpi_datatype<T>(),
|
||||
stat.source(), stat.tag(),
|
||||
MPI_Comm(m_comm), m_requests + 1));
|
||||
} else
|
||||
diff --git a/include/boost/mpi/graph_communicator.hpp b/include/boost/mpi/graph_communicator.hpp
|
||||
index d49703eb..5bd1cf28 100644
|
||||
--- a/boost/mpi/graph_communicator.hpp
|
||||
+++ b/boost/mpi/graph_communicator.hpp
|
||||
@@ -235,8 +235,8 @@ graph_communicator::setup_graph(const communicator& comm, const Graph& graph,
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Graph_create,
|
||||
((MPI_Comm)comm,
|
||||
nvertices,
|
||||
- &indices[0],
|
||||
- edges.empty()? (int*)0 : &edges[0],
|
||||
+ detail::c_data(indices),
|
||||
+ detail::c_data(edges),
|
||||
reorder,
|
||||
&newcomm));
|
||||
this->comm_ptr.reset(new MPI_Comm(newcomm), comm_free());
|
||||
diff --git a/include/boost/mpi/group.hpp b/include/boost/mpi/group.hpp
|
||||
index 103b35a1..7be24df1 100644
|
||||
--- a/boost/mpi/group.hpp
|
||||
+++ b/boost/mpi/group.hpp
|
||||
@@ -16,6 +16,7 @@
|
||||
#define BOOST_MPI_GROUP_HPP
|
||||
|
||||
#include <boost/mpi/exception.hpp>
|
||||
+#include <boost/mpi/detail/antiques.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
#include <vector>
|
||||
@@ -272,9 +273,9 @@ group::translate_ranks(InputIterator first, InputIterator last,
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Group_translate_ranks,
|
||||
((MPI_Group)*this,
|
||||
in_array.size(),
|
||||
- &in_array[0],
|
||||
+ detail::c_data(in_array),
|
||||
(MPI_Group)to_group,
|
||||
- &out_array[0]));
|
||||
+ detail::c_data(out_array)));
|
||||
|
||||
for (std::vector<int>::size_type i = 0, n = out_array.size(); i < n; ++i)
|
||||
*out++ = out_array[i];
|
||||
@@ -300,7 +301,7 @@ group group::include(InputIterator first, InputIterator last)
|
||||
std::vector<int> ranks(first, last);
|
||||
MPI_Group result;
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Group_incl,
|
||||
- ((MPI_Group)*this, ranks.size(), &ranks[0], &result));
|
||||
+ ((MPI_Group)*this, ranks.size(), detail::c_data(ranks), &result));
|
||||
return group(result, /*adopt=*/true);
|
||||
}
|
||||
|
||||
@@ -322,7 +323,7 @@ group group::exclude(InputIterator first, InputIterator last)
|
||||
std::vector<int> ranks(first, last);
|
||||
MPI_Group result;
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Group_excl,
|
||||
- ((MPI_Group)*this, ranks.size(), &ranks[0], &result));
|
||||
+ ((MPI_Group)*this, ranks.size(), detail::c_data(ranks), &result));
|
||||
return group(result, /*adopt=*/true);
|
||||
}
|
||||
|
||||
diff --git a/include/boost/mpi/nonblocking.hpp b/include/boost/mpi/nonblocking.hpp
|
||||
index fe944be8..5ffd00f7 100644
|
||||
--- a/boost/mpi/nonblocking.hpp
|
||||
+++ b/boost/mpi/nonblocking.hpp
|
||||
@@ -91,7 +91,7 @@ wait_any(ForwardIterator first, ForwardIterator last)
|
||||
int index;
|
||||
status stat;
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Waitany,
|
||||
- (n, &requests[0], &index, &stat.m_status));
|
||||
+ (n, detail::c_data(requests), &index, &stat.m_status));
|
||||
|
||||
// We don't have a notion of empty requests or status objects,
|
||||
// so this is an error.
|
||||
@@ -222,8 +222,8 @@ wait_all(ForwardIterator first, ForwardIterator last, OutputIterator out)
|
||||
// Let MPI wait until all of these operations completes.
|
||||
std::vector<MPI_Status> stats(num_outstanding_requests);
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Waitall,
|
||||
- (num_outstanding_requests, &requests[0],
|
||||
- &stats[0]));
|
||||
+ (num_outstanding_requests, detail::c_data(requests),
|
||||
+ detail::c_data(stats)));
|
||||
|
||||
for (std::vector<MPI_Status>::iterator i = stats.begin();
|
||||
i != stats.end(); ++i, ++out) {
|
||||
@@ -289,7 +289,7 @@ wait_all(ForwardIterator first, ForwardIterator last)
|
||||
|
||||
// Let MPI wait until all of these operations completes.
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Waitall,
|
||||
- (num_outstanding_requests, &requests[0],
|
||||
+ (num_outstanding_requests, detail::c_data(requests),
|
||||
MPI_STATUSES_IGNORE));
|
||||
|
||||
// Signal completion
|
||||
@@ -346,7 +346,7 @@ test_all(ForwardIterator first, ForwardIterator last, OutputIterator out)
|
||||
int flag = 0;
|
||||
int n = requests.size();
|
||||
std::vector<MPI_Status> stats(n);
|
||||
- BOOST_MPI_CHECK_RESULT(MPI_Testall, (n, &requests[0], &flag, &stats[0]));
|
||||
+ BOOST_MPI_CHECK_RESULT(MPI_Testall, (n, detail::c_data(requests), &flag, detail::c_data(stats)));
|
||||
if (flag) {
|
||||
for (int i = 0; i < n; ++i, ++out) {
|
||||
status stat;
|
||||
@@ -379,7 +379,7 @@ test_all(ForwardIterator first, ForwardIterator last)
|
||||
int flag = 0;
|
||||
int n = requests.size();
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Testall,
|
||||
- (n, &requests[0], &flag, MPI_STATUSES_IGNORE));
|
||||
+ (n, detail::c_data(requests), &flag, MPI_STATUSES_IGNORE));
|
||||
return flag != 0;
|
||||
}
|
||||
|
||||
@@ -483,8 +483,8 @@ wait_some(BidirectionalIterator first, BidirectionalIterator last,
|
||||
// Let MPI wait until some of these operations complete.
|
||||
int num_completed;
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Waitsome,
|
||||
- (n, &requests[0], &num_completed, &indices[0],
|
||||
- &stats[0]));
|
||||
+ (n, detail::c_data(requests), &num_completed, detail::c_data(indices),
|
||||
+ detail::c_data(stats)));
|
||||
|
||||
// Translate the index-based result of MPI_Waitsome into a
|
||||
// partitioning on the requests.
|
||||
@@ -591,7 +591,7 @@ wait_some(BidirectionalIterator first, BidirectionalIterator last)
|
||||
// Let MPI wait until some of these operations complete.
|
||||
int num_completed;
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Waitsome,
|
||||
- (n, &requests[0], &num_completed, &indices[0],
|
||||
+ (n, detail::c_data(requests), &num_completed, detail::c_data(indices),
|
||||
MPI_STATUSES_IGNORE));
|
||||
|
||||
// Translate the index-based result of MPI_Waitsome into a
|
||||
diff --git a/src/cartesian_communicator.cpp b/src/cartesian_communicator.cpp
|
||||
index a46f0bc2..3b15eb0d 100644
|
||||
--- a/libs/mpi/src/cartesian_communicator.cpp
|
||||
+++ b/libs/mpi/src/cartesian_communicator.cpp
|
||||
@@ -10,12 +10,13 @@
|
||||
#include <cassert>
|
||||
|
||||
#include <boost/mpi/cartesian_communicator.hpp>
|
||||
+#include <boost/mpi/detail/antiques.hpp>
|
||||
|
||||
namespace boost { namespace mpi {
|
||||
|
||||
namespace {
|
||||
template <typename T, typename A>
|
||||
- T* c_data(std::vector<T,A>& v) { return &(v[0]); }
|
||||
+ T* c_data(std::vector<T,A>& v) { return c_data(v); }
|
||||
}
|
||||
|
||||
std::ostream&
|
||||
|
||||
From 5a8e9efe89ba00e32713fd777a82bc8f30a0900d Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weik <fweik@icp.uni-stuttgart.de>
|
||||
Date: Wed, 10 Jun 2020 11:04:23 +0200
|
||||
Subject: [PATCH 2/4] added test with empty vector
|
||||
|
||||
---
|
||||
test/block_nonblock_test.cpp | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/block_nonblock_test.cpp b/test/block_nonblock_test.cpp
|
||||
index 3088b655..2ec02256 100644
|
||||
--- a/libs/mpi/test/block_nonblock_test.cpp
|
||||
+++ b/libs/mpi/test/block_nonblock_test.cpp
|
||||
@@ -82,7 +82,12 @@ BOOST_AUTO_TEST_CASE(non_blocking)
|
||||
fmt << "S" << i;
|
||||
strings[i] = fmt.str();
|
||||
}
|
||||
-
|
||||
+
|
||||
+ std::vector<int> empty;
|
||||
+
|
||||
+ BOOST_CHECK(test(world, empty, false, true));
|
||||
+ BOOST_CHECK(test(world, empty, false, false));
|
||||
+
|
||||
BOOST_CHECK(test(world, integers, true, true));
|
||||
BOOST_CHECK(test(world, integers, true, false));
|
||||
BOOST_CHECK(test(world, strings, true, true));
|
||||
|
||||
From 5e8edd184cb0d5af842392eb58dd797a23241615 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weik <fweik@icp.uni-stuttgart.de>
|
||||
Date: Thu, 11 Jun 2020 14:59:45 +0200
|
||||
Subject: [PATCH 4/4] fixed cartesian communicator
|
||||
|
||||
---
|
||||
src/cartesian_communicator.cpp | 17 ++++++-----------
|
||||
1 file changed, 6 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/cartesian_communicator.cpp b/src/cartesian_communicator.cpp
|
||||
index 3b15eb0d..946d41fd 100644
|
||||
--- a/libs/mpi/src/cartesian_communicator.cpp
|
||||
+++ b/libs/mpi/src/cartesian_communicator.cpp
|
||||
@@ -14,11 +14,6 @@
|
||||
|
||||
namespace boost { namespace mpi {
|
||||
|
||||
-namespace {
|
||||
- template <typename T, typename A>
|
||||
- T* c_data(std::vector<T,A>& v) { return c_data(v); }
|
||||
-}
|
||||
-
|
||||
std::ostream&
|
||||
operator<<(std::ostream& out, cartesian_dimension const& d) {
|
||||
out << '(' << d.size << ',';
|
||||
@@ -64,7 +59,7 @@ cartesian_communicator::cartesian_communicator(const communicator& comm,
|
||||
MPI_Comm newcomm;
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Cart_create,
|
||||
((MPI_Comm)comm, dims.size(),
|
||||
- c_data(dims), c_data(periodic),
|
||||
+ detail::c_data(dims), detail::c_data(periodic),
|
||||
int(reorder), &newcomm));
|
||||
if(newcomm != MPI_COMM_NULL) {
|
||||
comm_ptr.reset(new MPI_Comm(newcomm), comm_free());
|
||||
@@ -86,7 +81,7 @@ cartesian_communicator::cartesian_communicator(const cartesian_communicator& com
|
||||
|
||||
MPI_Comm newcomm;
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Cart_sub,
|
||||
- ((MPI_Comm)comm, c_data(bitset), &newcomm));
|
||||
+ ((MPI_Comm)comm, detail::c_data(bitset), &newcomm));
|
||||
if(newcomm != MPI_COMM_NULL) {
|
||||
comm_ptr.reset(new MPI_Comm(newcomm), comm_free());
|
||||
}
|
||||
@@ -105,7 +100,7 @@ cartesian_communicator::rank(const std::vector<int>& coords ) const {
|
||||
int r = -1;
|
||||
assert(int(coords.size()) == ndims());
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Cart_rank,
|
||||
- (MPI_Comm(*this), c_data(const_cast<std::vector<int>&>(coords)),
|
||||
+ (MPI_Comm(*this), detail::c_data(const_cast<std::vector<int>&>(coords)),
|
||||
&r));
|
||||
return r;
|
||||
}
|
||||
@@ -123,7 +118,7 @@ std::vector<int>
|
||||
cartesian_communicator::coordinates(int rk) const {
|
||||
std::vector<int> cbuf(ndims());
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Cart_coords,
|
||||
- (MPI_Comm(*this), rk, cbuf.size(), c_data(cbuf) ));
|
||||
+ (MPI_Comm(*this), rk, cbuf.size(), detail::c_data(cbuf) ));
|
||||
return cbuf;
|
||||
}
|
||||
|
||||
@@ -136,7 +131,7 @@ cartesian_communicator::topology( cartesian_topology& topo,
|
||||
std::vector<int> cdims(ndims);
|
||||
std::vector<int> cperiods(ndims);
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Cart_get,
|
||||
- (MPI_Comm(*this), ndims, c_data(cdims), c_data(cperiods), c_data(coords)));
|
||||
+ (MPI_Comm(*this), ndims, detail::c_data(cdims), detail::c_data(cperiods), detail::c_data(coords)));
|
||||
cartesian_topology res(cdims.begin(), cperiods.begin(), ndims);
|
||||
topo.swap(res);
|
||||
}
|
||||
@@ -173,7 +168,7 @@ cartesian_dimensions(int sz, std::vector<int>& dims) {
|
||||
int leftover = sz % min;
|
||||
|
||||
BOOST_MPI_CHECK_RESULT(MPI_Dims_create,
|
||||
- (sz-leftover, dims.size(), c_data(dims)));
|
||||
+ (sz-leftover, dims.size(), detail::c_data(dims)));
|
||||
return dims;
|
||||
}
|
||||
|
||||
11
boost-1.73.0-b2-build-flags.patch
Normal file
11
boost-1.73.0-b2-build-flags.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- boost_1_73_0/tools/build/src/engine/build.sh~ 2020-04-25 17:09:03.159419899 +0100
|
||||
+++ boost_1_73_0/tools/build/src/engine/build.sh 2020-04-25 17:11:35.085907844 +0100
|
||||
@@ -233,7 +233,7 @@
|
||||
|
||||
*)
|
||||
B2_CXX="${CXX} -x c++ -std=c++11"
|
||||
- B2_CXXFLAGS_RELEASE="-O2 -s"
|
||||
+ B2_CXXFLAGS_RELEASE="${RPM_OPT_FLAGS} ${RPM_LD_FLAGS}"
|
||||
B2_CXXFLAGS_DEBUG="-O0 -g"
|
||||
esac
|
||||
;;
|
||||
1466
boost-1.73.0-beast-coroutines.patch
Normal file
1466
boost-1.73.0-beast-coroutines.patch
Normal file
File diff suppressed because it is too large
Load diff
55
boost-1.73.0-build-optflags.patch
Normal file
55
boost-1.73.0-build-optflags.patch
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
--- boost_1_73_0/tools/build/src/tools/gcc.jam~ 2020-03-31 21:50:30.687635266 +0100
|
||||
+++ boost_1_73_0/tools/build/src/tools/gcc.jam 2020-03-31 21:50:32.943632779 +0100
|
||||
@@ -571,7 +571,7 @@
|
||||
|
||||
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
|
||||
@@ -581,7 +581,7 @@
|
||||
|
||||
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
|
||||
@@ -704,20 +704,20 @@
|
||||
###
|
||||
|
||||
# Declare flags and action for compilation.
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
||||
-
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
|
||||
-
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>extra : -Wall -Wextra ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>pedantic : -Wall -Wextra -pedantic ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||
+
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>full : ;
|
||||
+
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>extra : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>pedantic : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : ;
|
||||
|
||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
||||
toolset.flags gcc.compile OPTIONS <profiling>on : -pg ;
|
||||
24
boost-1.73.0-outcome-assert.patch
Normal file
24
boost-1.73.0-outcome-assert.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
From 9f414ea58264fe0a62172a06f4653adc7556c164 Mon Sep 17 00:00:00 2001
|
||||
From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)"
|
||||
<spamtrap@nedprod.com>
|
||||
Date: Mon, 27 Apr 2020 12:00:22 +0100
|
||||
Subject: [PATCH] Fix https://github.com/ned14/outcome/issues/223 where in
|
||||
debug builds, cloning a status_code_ptr causes a segfault.
|
||||
|
||||
---
|
||||
include/status_code_ptr.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/status_code_ptr.hpp b/include/status_code_ptr.hpp
|
||||
index 0f5efa1..bd5c278 100644
|
||||
--- boost_1_73_0/boost/outcome/experimental/status-code/status_code_ptr.hpp
|
||||
+++ boost_1_73_0/boost/outcome/experimental/status-code/status_code_ptr.hpp
|
||||
@@ -97,7 +97,7 @@ namespace detail
|
||||
#endif
|
||||
virtual void _do_erased_copy(status_code<void> &dst, const status_code<void> &src, size_t /*unused*/) const override // NOLINT
|
||||
{
|
||||
- assert(dst.domain() == *this);
|
||||
+ // Note that dst will not have its domain set
|
||||
assert(src.domain() == *this);
|
||||
auto &d = static_cast<_mycode &>(dst); // NOLINT
|
||||
const auto &_s = static_cast<const _mycode &>(src); // NOLINT
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 0039878782516ea3313608f99f0d50e846151bc2 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Wakely <jwakely@fedoraproject.org>
|
||||
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
|
||||
{
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 1ded9b9c219542442b3c10af815e5413a2a89c75 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas W Rodgers <trodgers@redhat.com>
|
||||
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
|
||||
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
From ebc90bc3e372dc8e5db21f79d2a79e4f5c4d01ee Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Palka <ppalka@redhat.com>
|
||||
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 <optimization>off : -O0 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>minimal : -O1 ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>minimal : ;
|
||||
toolset.flags gcc.compile OPTIONS <optimization>debug : -Og ;
|
||||
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>full : ;
|
||||
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>extra : -Wall -Wextra ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>pedantic : -Wall -Wextra -pedantic ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>extra : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>pedantic : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : ;
|
||||
|
||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
||||
toolset.flags gcc.compile OPTIONS <profiling>on : -pg ;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From d9554db26c3dbb00a6a293ee4fd4966e4e278da8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Dimov <pdimov@gmail.com>
|
||||
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 <pdimov@gmail.com>
|
||||
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
|
||||
;
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 6a8ff06728b64a1121a6179d891ab0baf3b9290b Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Palka <ppalka@redhat.com>
|
||||
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
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From 9ac89e9936b826c13e90611cb9a81a7aa0508d20 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Cho <michael@michaelcho.dev>
|
||||
Date: Sun, 30 Mar 2025 21:45:49 -0400
|
||||
Subject: [PATCH] Add include for add_const
|
||||
|
||||
Signed-off-by: Michael Cho <michael@michaelcho.dev>
|
||||
---
|
||||
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 <boost/mpl/if.hpp>
|
||||
#include <boost/range/detail/any_iterator_buffer.hpp>
|
||||
#include <boost/iterator/iterator_categories.hpp>
|
||||
+#include <boost/type_traits/add_const.hpp>
|
||||
#include <boost/type_traits/is_convertible.hpp>
|
||||
#include <boost/type_traits/is_reference.hpp>
|
||||
#include <boost/type_traits/remove_const.hpp>
|
||||
19
boost-cmake-soname.patch
Normal file
19
boost-cmake-soname.patch
Normal file
|
|
@ -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 ()
|
||||
|
|
@ -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.*")
|
||||
628
boost.spec
628
boost.spec
File diff suppressed because it is too large
Load diff
19
gating.yaml
19
gating.yaml
|
|
@ -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}
|
||||
21
libboost_thread.so
Normal file
21
libboost_thread.so
Normal file
|
|
@ -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
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
summary: CI Gating Plan
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (boost_1_90_0.tar.bz2) = 1c81b60f63367d7249f277f0a569c181926dcf5a725e30433dd336205f1782880489dd00df6a1a74fd107765d3ca2cd49f806788cabb7d5700a8a55927a9a199
|
||||
SHA512 (boost_1_73_0.tar.bz2) = 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /tools/boost/Sanity/boost-testsuite-sanity
|
||||
# Description: boost testing by upstream testsuite
|
||||
# Author: Michal Kolar <mkolar@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# 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 <mkolar@redhat.com>" > $(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)
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
PURPOSE of /tools/boost/Sanity/boost-testsuite-sanity
|
||||
Description: boost testing by upstream testsuite
|
||||
Author: Michal Kolar <mkolar@redhat.com>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
summary: boost testing by upstream testsuite
|
||||
description: ''
|
||||
contact:
|
||||
- Michal Kolar <mkolar@redhat.com>
|
||||
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
|
||||
|
|
@ -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 <mkolar@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# 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
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
integer
|
||||
random
|
||||
rational
|
||||
regex
|
||||
timer
|
||||
Loading…
Add table
Add a link
Reference in a new issue