This is an automated email from the ASF dual-hosted git repository.
jimjag pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2e60be5056 Upgrade minimal supported version of Boost to 1.84
2e60be5056 is described below
commit 2e60be5056c0019c45ae9173c95568a54145a76b
Author: Jim Jagielski <[email protected]>
AuthorDate: Wed Jul 1 08:42:18 2026 -0400
Upgrade minimal supported version of Boost to 1.84
---
main/boost/boost-clang.patch | 9 -
main/boost/boost-os2.patch | 22 ---
main/boost/boost_1_55_0.patch | 387 ------------------------------------------
main/boost/makefile.mk | 17 +-
main/boost/prj/d.lst | 44 +++--
main/external_deps.lst | 6 +-
6 files changed, 42 insertions(+), 443 deletions(-)
diff --git a/main/boost/boost-clang.patch b/main/boost/boost-clang.patch
deleted file mode 100644
index 1582a9e73f..0000000000
--- a/main/boost/boost-clang.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- misc/build/boost_1_55_0/boost/config/user.hpp 2023-01-20
06:52:20.006784000 +0200
-+++ misc/build/boost_1_55_0/boost/config/user.hpp 2023-01-20
06:54:54.816087000 +0200
-@@ -122,3 +122,6 @@
-
-
-
-+#if defined(__clang__)
-+#define BOOST_NO_CXX11_HDR_TUPLE
-+#endif
diff --git a/main/boost/boost-os2.patch b/main/boost/boost-os2.patch
deleted file mode 100644
index 2c23a877bc..0000000000
--- a/main/boost/boost-os2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- misc/boost_1_55_0/boost/tr1/detail/config.hpp 2010-06-12
11:30:02.000000000 +0200
-+++ misc/build/boost_1_55_0/boost/tr1/detail/config.hpp 2013-07-04
12:49:12.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <cstddef>
-
- #if (defined(__GNUC__) && !(defined(linux) || defined(__linux) ||
defined(__linux__))) \
-+ && !defined(__OS2__) \
- || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800))
- // Disable use of #include_next on Linux as typically we are installed in
a
- // directory that is searched *after* the std lib include path.
---- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2011-07-25
11:28:58.000000000 +0200
-+++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp 2013-07-04
12:50:44.000000000 +0200
-@@ -107,7 +107,7 @@
- # endif
-
- # if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC) \
-- && (defined(linux) || defined(__linux) || defined(__linux__) ||
defined(__GNU__) || defined(__GLIBC__))
-+ && (defined(__OS2__) || defined(linux) || defined(__linux) ||
defined(__linux__) || defined(__GNU__) || defined(__GLIBC__))
- // Disable use of #include_next on Linux as typically we are
installed in a directory that is searched
- // *after* the std lib include path:
- # define BOOST_TR1_DISABLE_INCLUDE_NEXT
-Binary files misc/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf and
misc/build/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf differ
diff --git a/main/boost/boost_1_55_0.patch b/main/boost/boost_1_55_0.patch
deleted file mode 100644
index 937c4704b4..0000000000
--- a/main/boost/boost_1_55_0.patch
+++ /dev/null
@@ -1,387 +0,0 @@
-diff -ur misc/boost_1_55_0/boost/asio/ssl/impl/context.ipp
misc/build/boost_1_55_0/boost/asio/ssl/impl/context.ipp
---- misc/boost_1_55_0/boost/asio/ssl/impl/context.ipp 2013-10-26
16:25:53.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/asio/ssl/impl/context.ipp 2016-03-23
01:11:12.425434000 -0700
-@@ -87,6 +87,14 @@
- handle_ = ::SSL_CTX_new(::SSLv2_server_method());
- break;
- #endif // defined(OPENSSL_NO_SSL2)
-+#if defined(OPENSSL_NO_SSL3)
-+ case context::sslv3:
-+ case context::sslv3_client:
-+ case context::sslv3_server:
-+ boost::asio::detail::throw_error(
-+ boost::asio::error::invalid_argument, "context");
-+ break;
-+#else // defined(OPENSSL_NO_SSL3)
- case context::sslv3:
- handle_ = ::SSL_CTX_new(::SSLv3_method());
- break;
-@@ -96,6 +104,7 @@
- case context::sslv3_server:
- handle_ = ::SSL_CTX_new(::SSLv3_server_method());
- break;
-+#endif // defined(OPENSSL_NO_SSL3)
- case context::tlsv1:
- handle_ = ::SSL_CTX_new(::TLSv1_method());
- break;
-diff -ur
misc/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
misc/build/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
---- misc/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
2013-05-20 05:32:20.000000000 -0700
-+++
misc/build/boost_1_55_0/boost/asio/ssl/old/detail/openssl_context_service.hpp
2016-03-23 01:11:12.426497000 -0700
-@@ -85,6 +85,13 @@
- impl = ::SSL_CTX_new(::SSLv2_server_method());
- break;
- #endif // defined(OPENSSL_NO_SSL2)
-+#if defined(OPENSSL_NO_SSL3)
-+ case context_base::sslv3:
-+ case context_base::sslv3_client:
-+ case context_base::sslv3_server:
-+ boost::asio::detail::throw_error(boost::asio::error::invalid_argument);
-+ break;
-+#else // defined(OPENSSL_NO_SSL3)
- case context_base::sslv3:
- impl = ::SSL_CTX_new(::SSLv3_method());
- break;
-@@ -94,6 +101,7 @@
- case context_base::sslv3_server:
- impl = ::SSL_CTX_new(::SSLv3_server_method());
- break;
-+#endif // defined(OPENSSL_NO_SSL3)
- case context_base::tlsv1:
- impl = ::SSL_CTX_new(::TLSv1_method());
- break;
-diff -ur misc/boost_1_55_0/boost/bind/arg.hpp
misc/build/boost_1_55_0/boost/bind/arg.hpp
---- misc/boost_1_55_0/boost/bind/arg.hpp 2007-11-25 10:07:19.000000000
-0800
-+++ misc/build/boost_1_55_0/boost/bind/arg.hpp 2016-03-23 01:11:12.421530000
-0700
-@@ -33,8 +33,7 @@
-
- template< class T > arg( T const & /* t */ )
- {
-- // static assert I == is_placeholder<T>::value
-- typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1:
-1 ];
-+ BOOST_STATIC_ASSERT( I == is_placeholder<T>::value );
- }
- };
-
-diff -ur misc/boost_1_55_0/boost/concept/detail/general.hpp
misc/build/boost_1_55_0/boost/concept/detail/general.hpp
---- misc/boost_1_55_0/boost/concept/detail/general.hpp 2010-06-08
12:31:13.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/concept/detail/general.hpp 2016-03-23
01:11:12.388374000 -0700
-@@ -65,10 +65,19 @@
-
- # endif
-
-+// Version check from https://svn.boost.org/trac/boost/changeset/82886
-+// (boost/static_assert.hpp)
-+#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ >= 7))) || defined(__clang__)
-+#define BOOST_CONCEPT_UNUSED_TYPEDEF __attribute__((unused))
-+#else
-+#define BOOST_CONCEPT_UNUSED_TYPEDEF /**/
-+#endif
-+
- # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
- typedef ::boost::concepts::detail::instantiate< \
- &::boost::concepts::requirement_<ModelFnPtr>::failed> \
-- BOOST_PP_CAT(boost_concept_check,__LINE__)
-+ BOOST_PP_CAT(boost_concept_check,__LINE__) \
-+ BOOST_CONCEPT_UNUSED_TYPEDEF
-
- }}
-
-diff -ur misc/boost_1_55_0/boost/math/special_functions/fpclassify.hpp
misc/build/boost_1_55_0/boost/math/special_functions/fpclassify.hpp
---- misc/boost_1_55_0/boost/math/special_functions/fpclassify.hpp
2013-09-28 09:19:47.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/math/special_functions/fpclassify.hpp
2016-03-23 01:11:12.392773000 -0700
-@@ -348,7 +348,7 @@
- { //!< \brief return true if floating-point type t is finite.
- typedef detail::fp_traits<long double>::type traits;
- typedef traits::method method;
-- typedef boost::is_floating_point<long double>::type fp_tag;
-+ //typedef boost::is_floating_point<long double>::type fp_tag;
- typedef long double value_type;
- return detail::isfinite_impl(static_cast<value_type>(x), method());
- }
-@@ -419,7 +419,7 @@
- {
- typedef detail::fp_traits<long double>::type traits;
- typedef traits::method method;
-- typedef boost::is_floating_point<long double>::type fp_tag;
-+ //typedef boost::is_floating_point<long double>::type fp_tag;
- typedef long double value_type;
- return detail::isnormal_impl(static_cast<value_type>(x), method());
- }
-@@ -508,7 +508,7 @@
- {
- typedef detail::fp_traits<long double>::type traits;
- typedef traits::method method;
-- typedef boost::is_floating_point<long double>::type fp_tag;
-+ //typedef boost::is_floating_point<long double>::type fp_tag;
- typedef long double value_type;
- return detail::isinf_impl(static_cast<value_type>(x), method());
- }
-@@ -594,7 +594,7 @@
- { //!< \brief return true if floating-point type t is NaN (Not A Number).
- typedef detail::fp_traits<long double>::type traits;
- typedef traits::method method;
-- typedef boost::is_floating_point<long double>::type fp_tag;
-+ //typedef boost::is_floating_point<long double>::type fp_tag;
- return detail::isnan_impl(x, method());
- }
- #endif
-diff -ur
misc/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp
misc/build/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp
---- misc/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp
2008-06-22 08:05:38.000000000 -0700
-+++
misc/build/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp
2016-03-23 01:11:12.407415000 -0700
-@@ -47,7 +47,6 @@
- typename parser_result<self_t, ScannerT>::type
- parse(ScannerT const& scan) const
- {
-- typedef typename parser_result<self_t, ScannerT>::type result_t;
- typedef typename ScannerT::value_t value_t;
- typedef typename ScannerT::iterator_t iterator_t;
-
-diff -ur misc/boost_1_55_0/boost/static_assert.hpp
misc/build/boost_1_55_0/boost/static_assert.hpp
---- misc/boost_1_55_0/boost/static_assert.hpp 2013-09-21 13:17:00.000000000
-0700
-+++ misc/build/boost_1_55_0/boost/static_assert.hpp 2016-03-23
01:11:12.430683000 -0700
-@@ -67,7 +67,7 @@
- //
- // If the compiler warns about unused typedefs then enable this:
- //
--#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ >= 7)))
-+#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ >= 7))) || defined(__clang__)
- # define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
- #else
- # define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
-diff -ur misc/boost_1_55_0/boost/tuple/detail/tuple_basic.hpp
misc/build/boost_1_55_0/boost/tuple/detail/tuple_basic.hpp
---- misc/boost_1_55_0/boost/tuple/detail/tuple_basic.hpp 2011-01-02
12:25:11.000000000 -0800
-+++ misc/build/boost_1_55_0/boost/tuple/detail/tuple_basic.hpp 2016-03-23
01:11:12.435344000 -0700
-@@ -225,7 +225,6 @@
- get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) {
- typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
- apply<cons<HT, TT> > impl;
-- typedef BOOST_DEDUCED_TYPENAME impl::type cons_element;
- return impl::call(c).head;
- }
-
-diff -ur misc/boost_1_55_0/boost/unordered/detail/equivalent.hpp
misc/build/boost_1_55_0/boost/unordered/detail/equivalent.hpp
---- misc/boost_1_55_0/boost/unordered/detail/equivalent.hpp 2012-12-05
14:06:57.000000000 -0800
-+++ misc/build/boost_1_55_0/boost/unordered/detail/equivalent.hpp
2016-03-23 01:04:46.934774000 -0700
-@@ -534,11 +534,11 @@
- }
-
- node_pointer first_node = static_cast<node_pointer>(prev->next_);
-- link_pointer end = first_node->group_prev_->next_;
-+ link_pointer end_var = first_node->group_prev_->next_;
-
-- std::size_t count = this->delete_nodes(prev, end);
-+ std::size_t count_var = this->delete_nodes(prev, end_var);
- this->fix_bucket(bucket_index, prev);
-- return count;
-+ return count_var;
- }
-
- iterator erase(c_iterator r)
-@@ -557,21 +557,21 @@
- return iterator(r2.node_);
- }
-
-- link_pointer erase_nodes(node_pointer begin, node_pointer end)
-+ link_pointer erase_nodes(node_pointer begin_arg, node_pointer end_arg)
- {
-- std::size_t bucket_index = this->hash_to_bucket(begin->hash_);
-+ std::size_t bucket_index = this->hash_to_bucket(begin_arg->hash_);
-
-- // Split the groups containing 'begin' and 'end'.
-+ // Split the groups containing 'begin_arg' and 'end_arg'.
- // And get the pointer to the node before begin while
- // we're at it.
-- link_pointer prev = split_groups(begin, end);
-+ link_pointer prev = split_groups(begin_arg, end_arg);
-
-- // If we don't have a 'prev' it means that begin is at the
-+ // If we don't have a 'prev' it means that begin_arg is at the
- // beginning of a block, so search through the blocks in the
- // same bucket.
- if (!prev) {
- prev = this->get_previous_start(bucket_index);
-- while (prev->next_ != begin)
-+ while (prev->next_ != begin_arg)
- prev =
static_cast<node_pointer>(prev->next_)->group_prev_;
- }
-
-@@ -581,24 +581,24 @@
-
static_cast<node_pointer>(prev->next_)->group_prev_->next_;
- this->delete_nodes(prev, group_end);
- bucket_index = this->fix_bucket(bucket_index, prev);
-- } while(prev->next_ != end);
-+ } while(prev->next_ != end_arg);
-
- return prev;
- }
-
-- static link_pointer split_groups(node_pointer begin, node_pointer end)
-+ static link_pointer split_groups(node_pointer begin_arg, node_pointer
end_arg)
- {
-- node_pointer prev = begin->group_prev_;
-- if (prev->next_ != begin) prev = node_pointer();
-+ node_pointer prev = begin_arg->group_prev_;
-+ if (prev->next_ != begin_arg) prev = node_pointer();
-
-- if (end) {
-- node_pointer first = end;
-- while (first != begin && first->group_prev_->next_ == first) {
-+ if (end_arg) {
-+ node_pointer first = end_arg;
-+ while (first != begin_arg && first->group_prev_->next_ ==
first) {
- first = first->group_prev_;
- }
-
-- boost::swap(first->group_prev_, end->group_prev_);
-- if (first == begin) return prev;
-+ boost::swap(first->group_prev_, end_arg->group_prev_);
-+ if (first == begin_arg) return prev;
- }
-
- if (prev) {
-@@ -606,7 +606,7 @@
- while (first->group_prev_->next_ == first) {
- first = first->group_prev_;
- }
-- boost::swap(first->group_prev_, begin->group_prev_);
-+ boost::swap(first->group_prev_, begin_arg->group_prev_);
- }
-
- return prev;
-diff -ur misc/boost_1_55_0/boost/unordered/detail/table.hpp
misc/build/boost_1_55_0/boost/unordered/detail/table.hpp
---- misc/boost_1_55_0/boost/unordered/detail/table.hpp 2013-08-18
02:44:14.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/unordered/detail/table.hpp 2016-03-23
01:04:46.936005000 -0700
-@@ -257,9 +257,9 @@
- return prev ? iterator(prev->next_) : iterator();
- }
-
-- std::size_t hash_to_bucket(std::size_t hash) const
-+ std::size_t hash_to_bucket(std::size_t hash_arg) const
- {
-- return policy::to_bucket(bucket_count_, hash);
-+ return policy::to_bucket(bucket_count_, hash_arg);
- }
-
- float load_factor() const
-@@ -655,8 +655,8 @@
- // assign_nodes takes ownership of the container's elements,
- // assigning to them if possible, and deleting any that are
- // left over.
-- assign_nodes<table> assign(*this);
-- table_impl::fill_buckets(x.begin(), *this, assign);
-+ assign_nodes<table> assign_var(*this);
-+ table_impl::fill_buckets(x.begin(), *this, assign_var);
- }
-
- void assign(table const& x, true_type)
-@@ -730,9 +730,9 @@
- // move_assign_nodes takes ownership of the container's
- // elements, assigning to them if possible, and deleting
- // any that are left over.
-- move_assign_nodes<table> assign(*this);
-+ move_assign_nodes<table> assign_var(*this);
- node_holder<node_allocator> nodes(x);
-- table_impl::fill_buckets(nodes.begin(), *this, assign);
-+ table_impl::fill_buckets(nodes.begin(), *this, assign_var);
- }
- }
-
-diff -ur misc/boost_1_55_0/boost/unordered/detail/unique.hpp
misc/build/boost_1_55_0/boost/unordered/detail/unique.hpp
---- misc/boost_1_55_0/boost/unordered/detail/unique.hpp 2013-08-18
02:44:14.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/unordered/detail/unique.hpp 2016-03-23
01:04:46.937066000 -0700
-@@ -529,9 +529,9 @@
-
- link_pointer end = static_cast<node_pointer>(prev->next_)->next_;
-
-- std::size_t count = this->delete_nodes(prev, end);
-+ std::size_t count_var = this->delete_nodes(prev, end);
- this->fix_bucket(bucket_index, prev);
-- return count;
-+ return count_var;
- }
-
- iterator erase(c_iterator r)
-@@ -550,19 +550,19 @@
- return iterator(r2.node_);
- }
-
-- void erase_nodes(node_pointer begin, node_pointer end)
-+ void erase_nodes(node_pointer begin_arg, node_pointer end_arg)
- {
-- std::size_t bucket_index = this->hash_to_bucket(begin->hash_);
-+ std::size_t bucket_index = this->hash_to_bucket(begin_arg->hash_);
-
-- // Find the node before begin.
-+ // Find the node before begin_arg
- link_pointer prev = this->get_previous_start(bucket_index);
-- while(prev->next_ != begin) prev = prev->next_;
-+ while(prev->next_ != begin_arg) prev = prev->next_;
-
- // Delete the nodes.
- do {
- this->delete_node(prev);
- bucket_index = this->fix_bucket(bucket_index, prev);
-- } while (prev->next_ != end);
-+ } while (prev->next_ != end_arg);
- }
-
-
////////////////////////////////////////////////////////////////////////
-diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp
misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp
---- misc/boost_1_55_0/boost/config/compiler/gcc.hpp 2013-09-17
09:55:51.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp 2019-11-04
09:59:20.741944674 -0800
-@@ -137,14 +137,18 @@
-
- // C++0x features in 4.3.n and later
- //
--#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) &&
defined(__GXX_EXPERIMENTAL_CXX0X__)
-+#if ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) &&
defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__cplusplus >= 201103L)
- // C++0x features are only enabled when -std=c++0x or -std=gnu++0x are
- // passed on the command line, which in turn defines
- // __GXX_EXPERIMENTAL_CXX0X__.
- # define BOOST_HAS_DECLTYPE
- # define BOOST_HAS_RVALUE_REFS
- # define BOOST_HAS_STATIC_ASSERT
--# define BOOST_HAS_VARIADIC_TMPL
-+# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4))
-+# define BOOST_HAS_VARIADIC_TMPL
-+# else
-+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+# endif
- #else
- # define BOOST_NO_CXX11_DECLTYPE
- # define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
-@@ -153,7 +157,7 @@
-
- // Variadic templates compiler:
- // http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
--# if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) &&
(__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
-+# if defined(__VARIADIC_TEMPLATES)
- # define BOOST_HAS_VARIADIC_TMPL
- # else
- # define BOOST_NO_CXX11_VARIADIC_TEMPLATES
-diff -ur misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp
misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp
---- misc/boost_1_55_0/boost/config/stdlib/libcpp.hpp 2012-05-15
04:57:21.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/config/stdlib/libcpp.hpp
-@@ -19,7 +19,7 @@
-
- #define BOOST_HAS_THREADS
-
--#ifdef _LIBCPP_HAS_NO_VARIADICS
-+#if defined(_LIBCPP_HAS_NO_VARIADICS) || (__cplusplus < 201103)
- # define BOOST_NO_CXX11_HDR_TUPLE
- #endif
-
---- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21
14:07:48.895886290 +0100
-+++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21
14:10:16.895419939 +0100
-@@ -95,6 +95,11 @@
- // compiler version:
- # define BOOST_TR1_STD_HEADER(name) <../4.0.0/name>
- /*
-+ * After version 6 the include path consists of the major number
only
-+ */
-+# elif (__GNUC__ > 6)
-+# define BOOST_TR1_STD_HEADER(name) <../__GNUC__/name>
-+ /*
- * Before version 3.4.0 the 0 patch level was not part of the
include path:
- */
- # elif defined (__GNUC_PATCHLEVEL__) && ((__GNUC_PATCHLEVEL__ > 0) || \
diff --git a/main/boost/makefile.mk b/main/boost/makefile.mk
index f78e4c4cf3..aa19b3da12 100644
--- a/main/boost/makefile.mk
+++ b/main/boost/makefile.mk
@@ -42,12 +42,8 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=boost_1_55_0
-TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
-PATCH_FILES= $(TARFILE_NAME).patch boost-clang.patch
-.IF "$(GUI)"=="OS2"
-PATCH_FILES+=boost-os2.patch
-.ENDIF
+TARFILE_NAME=boost_1_84_0
+TARFILE_MD5=9dcd632441e4da04a461082ebbafd337
CONFIGURE_DIR=
CONFIGURE_ACTION=
@@ -80,6 +76,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/algorithm
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/archive
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/asio
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assert
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/atomic
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bimap
$(INCCOM)$/$(PRJNAME)
@@ -91,8 +88,11 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/container
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/container_hash
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/core
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/coroutine
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/describe
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception
$(INCCOM)$/$(PRJNAME)
@@ -115,9 +115,11 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iostreams
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lexical_cast
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/move
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mp11
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm
$(INCCOM)$/$(PRJNAME)
@@ -143,7 +145,6 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/ratio
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/regex
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/serialization
$(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/signals
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/signals2
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit
$(INCCOM)$/$(PRJNAME)
@@ -152,8 +153,8 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) :
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/test
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/thread
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/timer
$(INCCOM)$/$(PRJNAME)
- @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tr1
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple
$(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_index
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/typeof
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits
$(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/units
$(INCCOM)$/$(PRJNAME)
diff --git a/main/boost/prj/d.lst b/main/boost/prj/d.lst
index 19734d398f..a0ddeaf9a7 100644
--- a/main/boost/prj/d.lst
+++ b/main/boost/prj/d.lst
@@ -36,6 +36,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl\impl
mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl\old
mkdir: %_DEST%\inc%_EXT%\boost\asio\ssl\old\detail
mkdir: %_DEST%\inc%_EXT%\boost\asio\windows
+mkdir: %_DEST%\inc%_EXT%\boost\assert
mkdir: %_DEST%\inc%_EXT%\boost\assign
mkdir: %_DEST%\inc%_EXT%\boost\assign\std
mkdir: %_DEST%\inc%_EXT%\boost\atomic
@@ -79,6 +80,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\config\platform
mkdir: %_DEST%\inc%_EXT%\boost\config\stdlib
mkdir: %_DEST%\inc%_EXT%\boost\container
mkdir: %_DEST%\inc%_EXT%\boost\container\detail
+mkdir: %_DEST%\inc%_EXT%\boost\container_hash
+mkdir: %_DEST%\inc%_EXT%\boost\container_hash\detail
+mkdir: %_DEST%\inc%_EXT%\boost\core
+mkdir: %_DEST%\inc%_EXT%\boost\core\detail
mkdir: %_DEST%\inc%_EXT%\boost\coroutine
mkdir: %_DEST%\inc%_EXT%\boost\coroutine\detail
mkdir: %_DEST%\inc%_EXT%\boost\coroutine\v1
@@ -89,6 +94,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\date_time
mkdir: %_DEST%\inc%_EXT%\boost\date_time\gregorian
mkdir: %_DEST%\inc%_EXT%\boost\date_time\local_time
mkdir: %_DEST%\inc%_EXT%\boost\date_time\posix_time
+mkdir: %_DEST%\inc%_EXT%\boost\describe
+mkdir: %_DEST%\inc%_EXT%\boost\describe\detail
mkdir: %_DEST%\inc%_EXT%\boost\detail
mkdir: %_DEST%\inc%_EXT%\boost\detail\win
mkdir: %_DEST%\inc%_EXT%\boost\dynamic_bitset
@@ -305,6 +312,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\iterator
mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail
mkdir: %_DEST%\inc%_EXT%\boost\lambda
mkdir: %_DEST%\inc%_EXT%\boost\lambda\detail
+mkdir: %_DEST%\inc%_EXT%\boost\lexical_cast
+mkdir: %_DEST%\inc%_EXT%\boost\lexical_cast\detail
mkdir: %_DEST%\inc%_EXT%\boost\locale
mkdir: %_DEST%\inc%_EXT%\boost\locale\boundary
mkdir: %_DEST%\inc%_EXT%\boost\logic
@@ -323,6 +332,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\math\tools
mkdir: %_DEST%\inc%_EXT%\boost\math\tools\detail
mkdir: %_DEST%\inc%_EXT%\boost\move
mkdir: %_DEST%\inc%_EXT%\boost\move\detail
+mkdir: %_DEST%\inc%_EXT%\boost\mp11
+mkdir: %_DEST%\inc%_EXT%\boost\mp11\detail
mkdir: %_DEST%\inc%_EXT%\boost\mpi
mkdir: %_DEST%\inc%_EXT%\boost\mpi\collectives
mkdir: %_DEST%\inc%_EXT%\boost\mpi\detail
@@ -548,8 +559,6 @@ mkdir: %_DEST%\inc%_EXT%\boost\regex\pending
mkdir: %_DEST%\inc%_EXT%\boost\regex\v4
mkdir: %_DEST%\inc%_EXT%\boost\serialization
mkdir: %_DEST%\inc%_EXT%\boost\serialization\detail
-mkdir: %_DEST%\inc%_EXT%\boost\signals
-mkdir: %_DEST%\inc%_EXT%\boost\signals\detail
mkdir: %_DEST%\inc%_EXT%\boost\signals2
mkdir: %_DEST%\inc%_EXT%\boost\signals2\detail
mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr
@@ -712,13 +721,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\thread\detail
mkdir: %_DEST%\inc%_EXT%\boost\thread\pthread
mkdir: %_DEST%\inc%_EXT%\boost\thread\win32
mkdir: %_DEST%\inc%_EXT%\boost\timer
-mkdir: %_DEST%\inc%_EXT%\boost\tr1
-mkdir: %_DEST%\inc%_EXT%\boost\tr1\detail
-mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1
-mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1\bcc32
-mkdir: %_DEST%\inc%_EXT%\boost\tr1\tr1\sun
mkdir: %_DEST%\inc%_EXT%\boost\tuple
mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail
+mkdir: %_DEST%\inc%_EXT%\boost\type_index
+mkdir: %_DEST%\inc%_EXT%\boost\type_index\detail
+mkdir: %_DEST%\inc%_EXT%\boost\type_index\runtime_cast
+mkdir: %_DEST%\inc%_EXT%\boost\type_index\runtime_cast\detail
mkdir: %_DEST%\inc%_EXT%\boost\type_traits
mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail
mkdir: %_DEST%\inc%_EXT%\boost\type_traits\msvc
@@ -806,6 +814,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\asio\ssl\old\* %_DEST%\inc%_EXT%\boost\asio\ssl\old
..\%__SRC%\inc\boost\asio\ssl\old\detail/*
%_DEST%\inc%_EXT%\boost\asio\ssl\old\detail
..\%__SRC%\inc\boost\asio\windows\* %_DEST%\inc%_EXT%\boost\asio\windows
+..\%__SRC%\inc\boost\assert\* %_DEST%\inc%_EXT%\boost\assert
..\%__SRC%\inc\boost\assign\* %_DEST%\inc%_EXT%\boost\assign
..\%__SRC%\inc\boost\assign\std\* %_DEST%\inc%_EXT%\boost\assign\std
..\%__SRC%\inc\boost\atomic\* %_DEST%\inc%_EXT%\boost\atomic
@@ -844,6 +853,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform
..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib
..\%__SRC%\inc\boost\container\* %_DEST%\inc%_EXT%\boost\container
+..\%__SRC%\inc\boost\container_hash\* %_DEST%\inc%_EXT%\boost\container_hash
+..\%__SRC%\inc\boost\container_hash\detail\*
%_DEST%\inc%_EXT%\boost\container_hash\detail
+..\%__SRC%\inc\boost\core\* %_DEST%\inc%_EXT%\boost\core
+..\%__SRC%\inc\boost\core\detail\* %_DEST%\inc%_EXT%\boost\core\detail
..\%__SRC%\inc\boost\coroutine\detail\*
%_DEST%\inc%_EXT%\boost\coroutine\detail
..\%__SRC%\inc\boost\coroutine\* %_DEST%\inc%_EXT%\boost\coroutine
..\%__SRC%\inc\boost\coroutine\v1\* %_DEST%\inc%_EXT%\boost\coroutine\v1
@@ -854,6 +867,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\date_time\gregorian\*
%_DEST%\inc%_EXT%\boost\date_time\gregorian
..\%__SRC%\inc\boost\date_time\local_time\*
%_DEST%\inc%_EXT%\boost\date_time\local_time
..\%__SRC%\inc\boost\date_time\posix_time\*
%_DEST%\inc%_EXT%\boost\date_time\posix_time
+..\%__SRC%\inc\boost\describe\* %_DEST%\inc%_EXT%\boost\describe
+..\%__SRC%\inc\boost\describe\detail\* %_DEST%\inc%_EXT%\boost\describe\detail
..\%__SRC%\inc\boost\detail\* %_DEST%\inc%_EXT%\boost\detail
..\%__SRC%\inc\boost\detail\win\* %_DEST%\inc%_EXT%\boost\detail\win
..\%__SRC%\inc\boost\dynamic_bitset\* %_DEST%\inc%_EXT%\boost\dynamic_bitset
@@ -1061,6 +1076,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail
..\%__SRC%\inc\boost\lambda\* %_DEST%\inc%_EXT%\boost\lambda
..\%__SRC%\inc\boost\lambda\detail\* %_DEST%\inc%_EXT%\boost\lambda\detail
+..\%__SRC%\inc\boost\lexical_cast\* %_DEST%\inc%_EXT%\boost\lexical_cast
+..\%__SRC%\inc\boost\lexical_cast\detail\*
%_DEST%\inc%_EXT%\boost\lexical_cast\detail
..\%__SRC%\inc\boost\locale\* %_DEST%\inc%_EXT%\boost\locale
..\%__SRC%\inc\boost\locale\boundary\* %_DEST%\inc%_EXT%\boost\locale\boundary
..\%__SRC%\inc\boost\logic\* %_DEST%\inc%_EXT%\boost\logic
@@ -1079,6 +1096,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\math\tools\detail\*
%_DEST%\inc%_EXT%\boost\math\tools\detail
..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move
..\%__SRC%\inc\boost\move\detail\* %_DEST%\inc%_EXT%\boost\move\detail
+..\%__SRC%\inc\boost\mp11\* %_DEST%\inc%_EXT%\boost\mp11
+..\%__SRC%\inc\boost\mp11\detail\* %_DEST%\inc%_EXT%\boost\mp11\detail
..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
@@ -1289,8 +1308,6 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\serialization\detail\*
%_DEST%\inc%_EXT%\boost\serialization\detail
..\%__SRC%\inc\boost\signals2\* %_DEST%\inc%_EXT%\boost\signals2
..\%__SRC%\inc\boost\signals2\detail\* %_DEST%\inc%_EXT%\boost\signals2\detail
-..\%__SRC%\inc\boost\signals\* %_DEST%\inc%_EXT%\boost\signals
-..\%__SRC%\inc\boost\signals\detail\* %_DEST%\inc%_EXT%\boost\signals\detail
..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr
..\%__SRC%\inc\boost\smart_ptr\detail\*
%_DEST%\inc%_EXT%\boost\smart_ptr\detail
..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor
@@ -1453,13 +1470,12 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\thread\detail\* %_DEST%\inc%_EXT%\boost\thread\detail
..\%__SRC%\inc\boost\thread\pthread\* %_DEST%\inc%_EXT%\boost\thread\pthread
..\%__SRC%\inc\boost\thread\win32\* %_DEST%\inc%_EXT%\boost\thread\win32
-..\%__SRC%\inc\boost\tr1\* %_DEST%\inc%_EXT%\boost\tr1
-..\%__SRC%\inc\boost\tr1\detail\* %_DEST%\inc%_EXT%\boost\tr1\detail
-..\%__SRC%\inc\boost\tr1\tr1\bcc32\* %_DEST%\inc%_EXT%\boost\tr1\tr1\bcc32
-..\%__SRC%\inc\boost\tr1\tr1\* %_DEST%\inc%_EXT%\boost\tr1\tr1
-..\%__SRC%\inc\boost\tr1\tr1\sun\* %_DEST%\inc%_EXT%\boost\tr1\tr1\sun
..\%__SRC%\inc\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple
..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail
+..\%__SRC%\inc\boost\type_index\* %_DEST%\inc%_EXT%\boost\type_index
+..\%__SRC%\inc\boost\type_index\detail\*
%_DEST%\inc%_EXT%\boost\type_index\detail
+..\%__SRC%\inc\boost\type_index\runtime_cast\*
%_DEST%\inc%_EXT%\boost\type_index\runtime_cast
+..\%__SRC%\inc\boost\type_index\runtime_cast\detail\*
%_DEST%\inc%_EXT%\boost\type_index\runtime_cast\detail
..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits
..\%__SRC%\inc\boost\type_traits\detail\*
%_DEST%\inc%_EXT%\boost\type_traits\detail
..\%__SRC%\inc\boost\type_traits\msvc\*
%_DEST%\inc%_EXT%\boost\type_traits\msvc
diff --git a/main/external_deps.lst b/main/external_deps.lst
index fa2fba3bcf..07a35373ca 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -200,9 +200,9 @@ if (SYSTEM_PYTHON != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST != YES)
- MD5 = d6eef4b4cacb2183f2bf265a5a03a354
- name = boost_1_55_0.tar.bz2
- URL1 =
https://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2
+ MD5 = 9dcd632441e4da04a461082ebbafd337
+ name = boost_1_84_0.tar.bz2
+ URL1 =
https://sourceforge.net/projects/boost/files/boost/1.84.0/boost_1_84_0.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_VIGRA != YES)
