From a95676bb253f6e66039f4f2327554d6736e4cd75 Mon Sep 17 00:00:00 2001 From: Florian Fischer <florian.fischer@muhq.space> Date: Mon, 27 Jun 2022 21:17:21 +0200 Subject: [PATCH] use liburing 2.2 wrap file provided via meson wrapdb --- emper/io/Future.cpp | 2 +- subprojects/liburing.wrap | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/emper/io/Future.cpp b/emper/io/Future.cpp index d0eef774..30bcaff9 100644 --- a/emper/io/Future.cpp +++ b/emper/io/Future.cpp @@ -192,7 +192,7 @@ void CancelWrapper::prepareSqeInternal(struct io_uring_sqe* sqe) { assert(future.submitter == IoContext::workerIo); } uint64_t user_data = IoContext::createFutureTag(future); - io_uring_prep_cancel(sqe, user_data, 0); + io_uring_prep_cancel64(sqe, user_data, 0); } void Future::completeSynchronously() { diff --git a/subprojects/liburing.wrap b/subprojects/liburing.wrap index 0245dd82..16f28c80 100644 --- a/subprojects/liburing.wrap +++ b/subprojects/liburing.wrap @@ -1,6 +1,12 @@ -[wrap-git] -url=https://github.com/fischerling/liburing.git -revision=7cef94c598c9137b8d98e2d361f0e6ed1e869919 +[wrap-file] +directory = liburing-liburing-2.2 +source_url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.2.tar.gz +source_filename = liburing-2.2.tar.gz +source_hash = e092624af6aa244ade2d52181cc07751ac5caba2f3d63e9240790db9ed130bbc +patch_filename = liburing_2.2-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/liburing_2.2-1/get_patch +patch_hash = 43fed02db27c38647500e859e3a42bf91585e7fbea37999bf50337cc46c7de26 +wrapdb_version = 2.2-1 [provide] uring = uring -- GitLab