Skip to content

Commit

Permalink
Merge pull request ceph#55787 from tchaikov/wip-cmake-liburing-2.5
Browse files Browse the repository at this point in the history
cmake: bump liburing from 0.7 to 2.5

Reviewed-by: Casey Bodley <[email protected]>
  • Loading branch information
tchaikov authored Mar 2, 2024
2 parents 3c07100 + 95e03f8 commit 91e8cea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cmake/modules/Builduring.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ function(build_uring)
set(source_dir_args
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/liburing
GIT_REPOSITORY https://github.com/axboe/liburing.git
GIT_TAG "liburing-0.7"
GIT_TAG "liburing-2.5"
GIT_SHALLOW TRUE
GIT_CONFIG advice.detachedHead=false)
endif()

include(ExternalProject)
ExternalProject_Add(liburing_ext
${source_dir_args}
CONFIGURE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} <SOURCE_DIR>/configure
CONFIGURE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} <SOURCE_DIR>/configure --use-libc
BUILD_COMMAND ${make_cmd} "CFLAGS=${CMAKE_C_FLAGS} -fPIC" -C src -s
BUILD_IN_SOURCE 1
BUILD_BYPRODUCTS "<SOURCE_DIR>/src/liburing.a"
Expand Down
2 changes: 1 addition & 1 deletion make-dist
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ boost_version=1.82.0
download_boost $boost_version a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 \
https://download.ceph.com/qa \
https://archives.boost.io/release/$boost_version/source
download_liburing 0.7 8e2842cfe947f3a443af301bdd6d034455536c38a455c7a700d0c1ad165a7543 \
download_liburing 2.5 456f5f882165630f0dc7b75e8fd53bd01a955d5d4720729b4323097e6e9f2a98 \
https://github.com/axboe/liburing/archive \
https://git.kernel.dk/cgit/liburing/snapshot
pmdk_version=1.10
Expand Down

0 comments on commit 91e8cea

Please sign in to comment.