From 1ddd4423bae9347535f7427809f87d4bdbde56de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 16 Dec 2021 16:46:40 +0100 Subject: [PATCH] Backport patch to add Boost 1.78 support --- ...FindBoost-Add-support-for-Boost-1.78.patch | 74 +++++++++++++++++++ cmake.spec | 8 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 0004-FindBoost-Add-support-for-Boost-1.78.patch diff --git a/0004-FindBoost-Add-support-for-Boost-1.78.patch b/0004-FindBoost-Add-support-for-Boost-1.78.patch new file mode 100644 index 0000000..a90e96b --- /dev/null +++ b/0004-FindBoost-Add-support-for-Boost-1.78.patch @@ -0,0 +1,74 @@ +From d176ff71c03f62d993d2fbad6aa416e64e336453 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Wed, 15 Dec 2021 10:16:59 -0500 +Subject: [PATCH 3/3] FindBoost: Add support for Boost 1.78 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the list of known versions. + +Run the command + + cmake -DBOOST_DIR=/path/to/boost_1_78_0 \ + -P Utilities/Scripts/BoostScanDeps.cmake + +to extract dependencies from the 1.78.0 source tree. + +The dependencies differ from those of 1.77: + +* The `log` component no longer depends on `date_time`. + +Fixes: #23016 +Signed-off-by: Björn Esser +--- + Modules/FindBoost.cmake | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 38faca24aa..0ad342f0e6 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- else() ++ elseif(Boost_VERSION_STRING VERSION_LESS 1.78.0) + set(_Boost_CONTRACT_DEPENDENCIES thread chrono) + set(_Boost_COROUTINE_DEPENDENCIES context) + set(_Boost_FIBER_DEPENDENCIES context) +@@ -1365,6 +1365,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) ++ else() ++ set(_Boost_CONTRACT_DEPENDENCIES thread chrono) ++ set(_Boost_COROUTINE_DEPENDENCIES context) ++ set(_Boost_FIBER_DEPENDENCIES context) ++ set(_Boost_IOSTREAMS_DEPENDENCIES regex) ++ set(_Boost_JSON_DEPENDENCIES container) ++ set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic) ++ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l) ++ set(_Boost_MPI_DEPENDENCIES serialization) ++ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization) ++ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version}) ++ set(_Boost_THREAD_DEPENDENCIES chrono atomic) ++ set(_Boost_TIMER_DEPENDENCIES chrono) ++ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) ++ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) + if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.78.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() +@@ -1638,7 +1653,7 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" ++ "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" + "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" + "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" + "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" +-- +2.33.1 + diff --git a/cmake.spec b/cmake.spec index 8443107..336a539 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -112,6 +112,9 @@ Patch102: %{name}-mingw-dl.patch # Add support for Python 3.11 (merged in upstream) # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6792 Patch103: 0003-Add-support-for-Python-3.11.patch +# Add support for Boost 1.78 (merged in upstream) +# https://gitlab.kitware.com/cmake/cmake/-/issues/23016 +Patch104: 0004-FindBoost-Add-support-for-Boost-1.78.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -529,6 +532,9 @@ popd %changelog +* Thu Dec 16 2021 Björn Esser - 3.22.1-3 +- Backport patch to add Boost 1.78 support + * Thu Dec 16 2021 Tomáš Hrnčiar - 3.22.1-2 - Backport patch to add Python 3.11 support