diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake index 3791b57123c..819a9b74471 100644 --- a/cmake/modules/BuildBoost.cmake +++ b/cmake/modules/BuildBoost.cmake @@ -133,14 +133,14 @@ function(do_build_boost version) check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version}) set(source_dir SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost") - elseif(version VERSION_GREATER 1.66) + elseif(version VERSION_GREATER 1.67) message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}") else() message(STATUS "boost will be downloaded...") # NOTE: If you change this version number make sure the package is available # at the three URLs below (may involve uploading to download.ceph.com) - set(boost_version 1.66.0) - set(boost_sha256 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9) + set(boost_version 1.67.0) + set(boost_sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba) string(REPLACE "." "_" boost_version_underscore ${boost_version} ) set(boost_url https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2) @@ -202,8 +202,8 @@ macro(build_boost version) add_library(Boost::${c} SHARED IMPORTED) endif() add_dependencies(Boost::${c} Boost) - if(c STREQUAL python AND PYTHON_VERSION_MAJOR EQUAL 3) - set(buildid 3) + if(c STREQUAL python) + set(buildid "${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") else() set(buildid "") endif() diff --git a/make-dist b/make-dist index b0083882fce..eb9aa7b0f2b 100755 --- a/make-dist +++ b/make-dist @@ -130,8 +130,8 @@ ln -s . $outfile tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/ceph.spec $outfile/alpine/APKBUILD # NOTE: If you change this version number make sure the package is available # at the three URLs referenced below (may involve uploading to download.ceph.com) -boost_version=1.66.0 -download_boost $boost_version 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9 \ +boost_version=1.67.0 +download_boost $boost_version 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba \ https://dl.bintray.com/boostorg/release/$boost_version/source \ https://downloads.sourceforge.net/project/boost/boost/$boost_version \ https://download.ceph.com/qa diff --git a/src/librados/librados_asio.h b/src/librados/librados_asio.h index 8aeb096966a..4764791c8a3 100644 --- a/src/librados/librados_asio.h +++ b/src/librados/librados_asio.h @@ -78,7 +78,7 @@ struct bound_completion_handler : public invoker { // static check for CompletionHandler concept (must be CopyConstructible and // callable with no arguments) using namespace boost::asio; - BOOST_ASIO_COMPLETION_HANDLER_CHECK(bound_completion_handler, *this) type_check; + BOOST_ASIO_LEGACY_COMPLETION_HANDLER_CHECK(bound_completion_handler, *this) type_check; } /// Invoke the completion handler with our bound arguments