This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 44d91126611a402cb83858e213a5a4bb08d3a428
Author: Devin Leamy <dle...@twitter.com>
AuthorDate: Mon Feb 12 16:52:03 2024 -0500
Update boost version to 1.81.0 for CentOS 9 support.
Boost 1.65.0 makes use of functions that are deprecated.
Specifically, `std::unary_function` which was deprecated in
C++11 and removed in C++17. As a result, boost cannot be built
on CentOS 9, which by default only supports C++17 (GCC 4.8.5).
Therefore, we're updating boost to a newer version which can be built
using CentOS 9's GCC 11.4.1 compiler.
Tested on CentOS 7 and CentOS 9.
---
3rdparty/boost-1.65.0.patch | 64 -------------------------------------------
3rdparty/boost-1.65.0.tar.gz | Bin 1202770 -> 0 bytes
3rdparty/boost-1.81.0.tar.gz | Bin 0 -> 1710164 bytes
3rdparty/boost.md | 22 +++++++--------
3rdparty/versions.am | 2 +-
5 files changed, 12 insertions(+), 76 deletions(-)
diff --git a/3rdparty/boost-1.65.0.patch b/3rdparty/boost-1.65.0.patch
deleted file mode 100644
index a351fad3c..000000000
--- a/3rdparty/boost-1.65.0.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git c/boost/config/compiler/visualc.hpp
i/boost/config/compiler/visualc.hpp
-index c0557de71..c06eaea45 100644
---- c/boost/config/compiler/visualc.hpp
-+++ i/boost/config/compiler/visualc.hpp
-@@ -319,13 +319,3 @@
-
- # define BOOST_COMPILER "Microsoft Visual C++ version "
BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
- #endif
--
--//
--// last known and checked version is 19.10.25017 (VC++ 2017):
--#if (_MSC_VER > 1910)
--# if defined(BOOST_ASSERT_CONFIG)
--# error "Unknown compiler version - please run the configure tests and
report the results"
--# else
--# pragma message("Unknown compiler version - please run the configure
tests and report the results")
--# endif
--#endif
-From f48fd09d021db9a28bd7b8452c175897e1af4485 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geiss...@amadeus.com>
-Date: Thu, 1 Mar 2018 09:59:33 +0100
-Subject: [PATCH] Ignore gcc 8 warnings.
-
----
- boost/mpl/assert.hpp | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/boost/mpl/assert.hpp b/boost/mpl/assert.hpp
-index 1af1b058..e41b583c 100644
---- a/boost/mpl/assert.hpp
-+++ b/boost/mpl/assert.hpp
-@@ -184,16 +184,27 @@ template< typename P > struct assert_arg_pred_not
- typedef typename assert_arg_pred_impl<p>::type type;
- };
-
-+#if defined(BOOST_GCC) && BOOST_GCC >= 80000
-+#define BOOST_MPL_IGNORE_PARENTHESES_WARNING
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wparentheses"
-+#endif
-+
- template< typename Pred >
--failed ************ (Pred::************
-+failed ************ (Pred::************
- assert_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type )
- );
-
- template< typename Pred >
--failed ************ (boost::mpl::not_<Pred>::************
-+failed ************ (boost::mpl::not_<Pred>::************
- assert_not_arg( void (*)(Pred), typename
assert_arg_pred_not<Pred>::type )
- );
-
-+#ifdef BOOST_MPL_IGNORE_PARENTHESES_WARNING
-+#undef BOOST_MPL_IGNORE_PARENTHESES_WARNING
-+#pragma GCC diagnostic pop
-+#endif
-+
- template< typename Pred >
- AUX778076_ASSERT_ARG(assert<false>)
- assert_arg( void (*)(Pred), typename assert_arg_pred_not<Pred>::type );
---
-2.30.2
-
diff --git a/3rdparty/boost-1.65.0.tar.gz b/3rdparty/boost-1.65.0.tar.gz
deleted file mode 100644
index b09d18549..000000000
Binary files a/3rdparty/boost-1.65.0.tar.gz and /dev/null differ
diff --git a/3rdparty/boost-1.81.0.tar.gz b/3rdparty/boost-1.81.0.tar.gz
new file mode 100644
index 000000000..0838f687f
Binary files /dev/null and b/3rdparty/boost-1.81.0.tar.gz differ
diff --git a/3rdparty/boost.md b/3rdparty/boost.md
index d6e482f84..30c40ea72 100644
--- a/3rdparty/boost.md
+++ b/3rdparty/boost.md
@@ -3,15 +3,15 @@
README for the Mesos third party Boost distribution.
We use the Boost `bcp` utility to bundle only the minimum subset of Boost
headers used by Mesos.
-See: http://www.boost.org/doc/libs/1_65_0/tools/bcp/doc/html/index.html
+See: http://www.boost.org/doc/libs/1_81_0/tools/bcp/doc/html/index.html
-## Instructions for upgrading Boost. (Based on Boost 1.65.0)
+## Instructions for upgrading Boost. (Based on Boost 1.81.0)
```
-# Download Boost tarball e.g. boost_1_65_0.tar.gz
+# Download Boost tarball e.g. boost_1_81_0.tar.gz
# Uncompress Boost and build bcp.
- $ tar -zxvf boost_1_65_0.tar.gz
- $ cd boost_1_65_0
+ $ tar -zxvf boost_1_81_0.tar.gz
+ $ cd boost_1_81_0
$ ./bootstrap.sh
$ ./b2 tools/bcp
@@ -19,22 +19,22 @@ See:
http://www.boost.org/doc/libs/1_65_0/tools/bcp/doc/html/index.html
$ find </path/to/mesos> -name "*.cpp" -o -name "*.hpp" > files.txt
# Scan the source files using bcp to produce a subset of the headers.
- $ mkdir ../boost-1.65.0
- $ cat files.txt | xargs -I {} ./dist/bin/bcp --scan --boost=./ {}
../boost-1.65.0
+ $ mkdir ../boost-1.81.0
+ $ cat files.txt | xargs -I {} ./dist/bin/bcp --scan --boost=./ {}
../boost-1.81.0
# Inspect contents of extracted headers and remove unnecessary lib files.
- $ cd ../boost-1.65.0
+ $ cd ../boost-1.81.0
$ rm -r libs
# Compress Boost directory and bundle it into Mesos.
$ cd ..
- $ GZIP=--best tar -zcf boost-1.65.0.tar.gz boost-1.65.0
- $ cp boost-1.65.0.tar.gz </path/to/mesos>/3rdparty/
+ $ GZIP=--best tar -zcf boost-1.81.0.tar.gz boost-1.81.0
+ $ cp boost-1.81.0.tar.gz </path/to/mesos>/3rdparty/
# Update 3rdparty/cmake/Versions.cmake with the new version and
# its SHA-256 hash. You can obtain the hash as follows, make sure
# to do this on the stripped release:
- $ openssl sha256 3rdparty/boost-1.65.0.tar.gz
+ $ openssl sha256 3rdparty/boost-1.81.0.tar.gz
# Update this README if needed.
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
index 3e62a7145..da9f2ee99 100644
--- a/3rdparty/versions.am
+++ b/3rdparty/versions.am
@@ -19,7 +19,7 @@
# third-party packages in exactly one place. For now, however, we
# still need to update version numbers in src/python/setup.py.in too!
-BOOST_VERSION = 1.65.0
+BOOST_VERSION = 1.81.0
CONCURRENTQUEUE_VERSION = 7b69a8f
CSI_V0_VERSION = 0.2.0
CSI_V1_VERSION = 1.1.0
