From 95e03f88094918005a14c2ac719b991c40e656ab Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 27 Feb 2024 22:25:32 +0800 Subject: [PATCH] cmake: bump liburing from 0.7 to 2.5 this allows us to use newer liburing features. Seastar is using some of them which are not provided by liburing 0.7. in this change, `--use-libc` is passed to configure. otherwise it does not link against libc, and the symbles like memset() won't be available when compiling liburing.so with -fPIC using clang, which does not pull libc in that case. Signed-off-by: Kefu Chai --- cmake/modules/Builduring.cmake | 4 ++-- make-dist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/Builduring.cmake b/cmake/modules/Builduring.cmake index 4b27a989ac4b7..4e4107fb5ac79 100644 --- a/cmake/modules/Builduring.cmake +++ b/cmake/modules/Builduring.cmake @@ -9,7 +9,7 @@ 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() @@ -17,7 +17,7 @@ function(build_uring) include(ExternalProject) ExternalProject_Add(liburing_ext ${source_dir_args} - CONFIGURE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} /configure + CONFIGURE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} /configure --use-libc BUILD_COMMAND ${make_cmd} "CFLAGS=${CMAKE_C_FLAGS} -fPIC" -C src -s BUILD_IN_SOURCE 1 BUILD_BYPRODUCTS "/src/liburing.a" diff --git a/make-dist b/make-dist index 41cee50a6d393..d8031040dd743 100755 --- a/make-dist +++ b/make-dist @@ -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 -- 2.47.3