From df4528d6668ab18e40584fe540355bdfba0fb6dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 20:24:29 +0200 Subject: Adding debian version 14.2.21-1. Signed-off-by: Daniel Baumann --- .../patches/cmake_add_1.74_to_known_versions.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 debian/patches/cmake_add_1.74_to_known_versions.patch (limited to 'debian/patches/cmake_add_1.74_to_known_versions.patch') diff --git a/debian/patches/cmake_add_1.74_to_known_versions.patch b/debian/patches/cmake_add_1.74_to_known_versions.patch new file mode 100644 index 00000000..00478891 --- /dev/null +++ b/debian/patches/cmake_add_1.74_to_known_versions.patch @@ -0,0 +1,52 @@ +Description: cmake: add 1.74 to known versions +Author: Kefu Chai +Bug-Debian: https://bugs.debian.org/977243 +Origin: upstream, https://github.com/ceph/ceph/commit/b6a94da6149e50bdd43752919d7c01b04c59f79e.patch +Last-Update: 2020-12-13 + +--- ceph-14.2.15.orig/cmake/modules/FindBoost.cmake ++++ ceph-14.2.15/cmake/modules/FindBoost.cmake +@@ -437,10 +437,23 @@ if (NOT Boost_NO_BOOST_CMAKE) + endif() + endif() + ++ set(_boost_FIND_PACKAGE_ARGS "") ++ if(Boost_NO_SYSTEM_PATHS) ++ list(APPEND _boost_FIND_PACKAGE_ARGS NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) ++ endif() ++ + # Do the same find_package call but look specifically for the CMake version. + # Note that args are passed in the Boost_FIND_xxxxx variables, so there is no + # need to delegate them to this find_package call. +- find_package(Boost QUIET NO_MODULE) ++ cmake_policy(PUSH) ++ if(BOOST_ROOT AND NOT Boost_ROOT) ++ if(POLICY CMP0074) ++ cmake_policy(SET CMP0074 NEW) ++ endif() ++ set(Boost_ROOT "${BOOST_ROOT}") ++ endif() ++ find_package(Boost QUIET NO_MODULE ${_boost_FIND_PACKAGE_ARGS}) ++ cmake_policy(POP) + mark_as_advanced(Boost_DIR) + + # If we found a boost cmake package, then we're done. Print out what we found. +@@ -1157,7 +1170,7 @@ function(_Boost_COMPONENT_DEPENDENCIES c + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- if(NOT Boost_VERSION_STRING VERSION_LESS 1.73.0) ++ if(NOT Boost_VERSION_STRING VERSION_LESS 1.75.0) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() + endif() +@@ -1429,7 +1442,8 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" ++ "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" + "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" -- cgit v1.2.3