RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 05:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21572 from tchaikov/wip-boost-1.67

Browse Source 
cmake,make-dist: bump up boost version to 1.67

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
This commit is contained in:
Kefu Chai 2018-04-23 22:57:47 +08:00 committed by GitHub
commit f612f0f151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/modules/BuildBoost.cmake
View File

@ -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()

4
make-dist
View File

@ -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

2
src/librados/librados_asio.h
View File

@ -78,7 +78,7 @@ struct bound_completion_handler : public invoker<Result> {
// 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