From a7ae7f93fb6e4d33af7d9a15f2b2a346694740fc Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 7 Mar 2025 00:03:15 -0800 Subject: [PATCH 01/13] [vcpkg baseline] Fix folly install failed --- ports/folly/portfile.cmake | 5 ++--- ports/folly/vcpkg.json | 1 + ports/liburing/portfile.cmake | 16 +++++++++++++++- ports/liburing/vcpkg.json | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 68cc2441d3ad2a..a36d970def6676 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -41,15 +41,14 @@ else() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "liburing" WITH_liburing - "libaio" WITH_libaio INVERTED_FEATURES "bzip2" CMAKE_DISABLE_FIND_PACKAGE_BZip2 "lz4" CMAKE_DISABLE_FIND_PACKAGE_LZ4 "zstd" CMAKE_DISABLE_FIND_PACKAGE_Zstd "snappy" CMAKE_DISABLE_FIND_PACKAGE_Snappy + "libaio" CMAKE_DISABLE_FIND_PACKAGE_LibAIO "libsodium" CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium + "liburing" CMAKE_DISABLE_FIND_PACKAGE_LibUring ) vcpkg_cmake_configure( diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 9b820861ba45ae..81f561bdfe911c 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,7 @@ { "name": "folly", "version-string": "2025.03.03.00", + "port-version": 1, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 270d1f4121fd5b..1e6c7bec3d9739 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -1,12 +1,26 @@ +vcpkg_download_distfile(SYNC_ZCRX_CHANGES_1 + URLS https://github.com/axboe/liburing/commit/48d8d54e524a9c37e0cc52921bb41070156a597f.patch?full_index=1 + SHA512 d16a6622538256c163785c0eaa89dd2ac53c5e7f1a93fc471198325628305d3d494ca3716233e666d0589d3d0a9e67708f6e8c2b46cda3bc4588fde11e091749 + FILENAME liburing-sync-zcrx-changes-1.patch +) + +vcpkg_download_distfile(SYNC_ZCRX_CHANGES_2 + URLS https://github.com/axboe/liburing/commit/ce3a65747d43a405cc19a630d5f8a0f613293f5c.patch?full_index=1 + SHA512 571d0e8cdc5334208947de750b6458277653d64235dfeae99ae130e8de61e9ababc5827232eae9db3f44743fd93dd22f1cd248ec2ea22a035dd7efd10f18b2bd + FILENAME liburing-sync-zcrx-changes-2.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing REF "liburing-${VERSION}" - SHA512 d40d041b94bb0f004bd92890988c0e4b8a7bb9ae43659790ee4b19e5417f7dc5b9a554489834769ee71edfc6a44bcd87a5fca34845f61cc80e4e8e588c6950ec + SHA512 f27233e6128444175b18cd1d45647acdd27b906a8cd561029508710e443b44416b916cad1b2c1217e23d9a5ffb5ba68b119e9c812eae406650fbd10bf26c2fa5 HEAD_REF master PATCHES fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED disable-tests-and-examples.patch + ${SYNC_ZCRX_CHANGES_1} + ${SYNC_ZCRX_CHANGES_2} ) # https://github.com/axboe/liburing/blob/liburing-2.8/src/Makefile#L13 diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 82812b47c43206..9183572b3868f1 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "liburing", - "version": "2.8", + "version": "2.9", "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "license": "(MIT OR LGPL-2.1) AND (MIT OR (GPL-2.0 WITH Linux-syscall-note))", From 21ac330bc8092faf3df021e68002d2cf36758b48 Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 7 Mar 2025 00:05:47 -0800 Subject: [PATCH 02/13] update version --- versions/baseline.json | 4 ++-- versions/f-/folly.json | 5 +++++ versions/l-/liburing.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b7cc09979ca47d..ec880409adffeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2874,7 +2874,7 @@ }, "folly": { "baseline": "2025.03.03.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.1.0", @@ -5321,7 +5321,7 @@ "port-version": 3 }, "liburing": { - "baseline": "2.8", + "baseline": "2.9", "port-version": 0 }, "libusb": { diff --git a/versions/f-/folly.json b/versions/f-/folly.json index beaa8e3473acc4..bc4b4b349be4e2 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cadd32f8817dad1ffc8906831f3e642f145196d", + "version-string": "2025.03.03.00", + "port-version": 1 + }, { "git-tree": "24ff1024cd8926301fe2e10c8c3976a1d698f7eb", "version-string": "2025.03.03.00", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 20a28e7bc46fc0..79631efa4f9b3f 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f92bbd879f63b39177cc53a989ceb5379bca49b", + "version": "2.9", + "port-version": 0 + }, { "git-tree": "d7ec4cc6b825d55cc4c5f2768d85d01398735f64", "version": "2.8", From 8c4f0fa12a2e45842bc73076adcaef07977efb4f Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 7 Mar 2025 01:27:20 -0800 Subject: [PATCH 03/13] Modify feature to dependency --- ports/folly/portfile.cmake | 2 -- ports/folly/vcpkg.json | 22 ++++++++-------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index a36d970def6676..3208991c9a7c04 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -46,9 +46,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "lz4" CMAKE_DISABLE_FIND_PACKAGE_LZ4 "zstd" CMAKE_DISABLE_FIND_PACKAGE_Zstd "snappy" CMAKE_DISABLE_FIND_PACKAGE_Snappy - "libaio" CMAKE_DISABLE_FIND_PACKAGE_LibAIO "libsodium" CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium - "liburing" CMAKE_DISABLE_FIND_PACKAGE_LibUring ) vcpkg_cmake_configure( diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 81f561bdfe911c..1ef5403cd2d88f 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -25,12 +25,20 @@ "fmt", "gflags", "glog", + { + "name": "libaio", + "platform": "linux" + }, "libevent", "liblzma", { "name": "libunwind", "platform": "linux" }, + { + "name": "liburing", + "platform": "linux" + }, "openssl", { "name": "vcpkg-cmake", @@ -49,26 +57,12 @@ "bzip2" ] }, - "libaio": { - "description": "Support compile with libaio", - "supports": "linux", - "dependencies": [ - "libaio" - ] - }, "libsodium": { "description": "Support libsodium for cryto", "dependencies": [ "libsodium" ] }, - "liburing": { - "description": "Support compile with liburing", - "supports": "linux", - "dependencies": [ - "liburing" - ] - }, "lz4": { "description": "Support lz4 for compression", "dependencies": [ From 1c8629477ae6b7a217cb1541a34784c10d05b7ec Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 7 Mar 2025 01:28:04 -0800 Subject: [PATCH 04/13] update version --- versions/f-/folly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/folly.json b/versions/f-/folly.json index bc4b4b349be4e2..87becd6c7625d9 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2cadd32f8817dad1ffc8906831f3e642f145196d", + "git-tree": "f536681a98817d30d7422bcac625db893c429697", "version-string": "2025.03.03.00", "port-version": 1 }, From 74357272eb7c8e3cf91a96b648ddefaa11ccfc0a Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Mon, 10 Mar 2025 03:14:44 -0700 Subject: [PATCH 05/13] update vcpkg.json of cachelib --- ports/cachelib/vcpkg.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/cachelib/vcpkg.json b/ports/cachelib/vcpkg.json index 2635753092b224..3c468487aee2cb 100644 --- a/ports/cachelib/vcpkg.json +++ b/ports/cachelib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cachelib", "version-string": "2024.07.15.00", + "port-version": 1, "description": "Pluggable caching engine to build and scale high performance cache services.", "homepage": "https://github.com/facebook/CacheLib", "license": "Apache-2.0", @@ -11,9 +12,7 @@ "fmt", { "name": "folly", - "features": [ - "libaio" - ] + "platform": "linux" }, "gflags", "glog", From 3708fdb68a73c89fda51840dfa965a0c9f2557ae Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Mon, 10 Mar 2025 03:16:12 -0700 Subject: [PATCH 06/13] update version --- versions/baseline.json | 2 +- versions/c-/cachelib.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index ec880409adffeb..19f2ff863d530b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1474,7 +1474,7 @@ }, "cachelib": { "baseline": "2024.07.15.00", - "port-version": 0 + "port-version": 1 }, "caf": { "baseline": "1.0.2", diff --git a/versions/c-/cachelib.json b/versions/c-/cachelib.json index 6c105bb257ec6b..dc32b929f6c641 100644 --- a/versions/c-/cachelib.json +++ b/versions/c-/cachelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b3bd35ac30115e6dd80a7e12413a7eabf8ac2fc", + "version-string": "2024.07.15.00", + "port-version": 1 + }, { "git-tree": "4c51a07152ad871b913be51d20251c0e92c7c440", "version-string": "2024.07.15.00", From cf1d9611cbdb7c6d892cdb2de82e889f42c38595 Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Wed, 12 Mar 2025 00:31:23 -0700 Subject: [PATCH 07/13] add compile option --- ports/cachelib/vcpkg.json | 5 ++- ports/folly/fix-has-include.patch | 71 +++++++++++++++++++++++++++++++ ports/folly/portfile.cmake | 4 ++ ports/folly/vcpkg.json | 22 ++++++---- 4 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 ports/folly/fix-has-include.patch diff --git a/ports/cachelib/vcpkg.json b/ports/cachelib/vcpkg.json index 3c468487aee2cb..2635753092b224 100644 --- a/ports/cachelib/vcpkg.json +++ b/ports/cachelib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cachelib", "version-string": "2024.07.15.00", - "port-version": 1, "description": "Pluggable caching engine to build and scale high performance cache services.", "homepage": "https://github.com/facebook/CacheLib", "license": "Apache-2.0", @@ -12,7 +11,9 @@ "fmt", { "name": "folly", - "platform": "linux" + "features": [ + "libaio" + ] }, "gflags", "glog", diff --git a/ports/folly/fix-has-include.patch b/ports/folly/fix-has-include.patch new file mode 100644 index 00000000000000..b6d3cae281c50b --- /dev/null +++ b/ports/folly/fix-has-include.patch @@ -0,0 +1,71 @@ +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake +index e41c128..cdba5d8 100644 +--- a/CMake/folly-deps.cmake ++++ b/CMake/folly-deps.cmake +@@ -151,12 +151,14 @@ if(WITH_libaio) + find_package(LibAIO) + list(APPEND FOLLY_LINK_LIBRARIES ${LIBAIO_LIBRARIES}) + list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBAIO_INCLUDE_DIRS}) ++ add_compile_options(-DFOLLY_WITH_LIBAIO) + endif() + + if(WITH_liburing) + find_package(LibUring) + list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES}) + list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS}) ++ add_compile_options(-DFOLLY_WITH_LIBURING) + endif() + + if(NOT CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium) +diff --git a/folly/io/async/AsyncIO.cpp b/folly/io/async/AsyncIO.cpp +index 93cda44..b2b466b 100644 +--- a/folly/io/async/AsyncIO.cpp ++++ b/folly/io/async/AsyncIO.cpp +@@ -35,7 +35,7 @@ + #include + #endif + +-#if __has_include() ++#if __has_include() && defined FOLLY_WITH_LIBAIO + + // debugging helpers + namespace { +diff --git a/folly/io/async/AsyncIO.h b/folly/io/async/AsyncIO.h +index b1a6f52..2d1d99c 100644 +--- a/folly/io/async/AsyncIO.h ++++ b/folly/io/async/AsyncIO.h +@@ -18,7 +18,7 @@ + + #include + +-#if __has_include() ++#if __has_include() && defined FOLLY_WITH_LIBAIO + + #include + +diff --git a/folly/io/async/Liburing.h b/folly/io/async/Liburing.h +index 8e81aaa..92f0ddf 100644 +--- a/folly/io/async/Liburing.h ++++ b/folly/io/async/Liburing.h +@@ -16,7 +16,7 @@ + + #pragma once + +-#if defined(__linux__) && __has_include() ++#if defined(__linux__) && __has_include() && defined FOLLY_WITH_LIBURING + #define FOLLY_HAS_LIBURING 1 + #else + #define FOLLY_HAS_LIBURING 0 +diff --git a/folly/io/async/SimpleAsyncIO.cpp b/folly/io/async/SimpleAsyncIO.cpp +index 807a2be..442c9ad 100644 +--- a/folly/io/async/SimpleAsyncIO.cpp ++++ b/folly/io/async/SimpleAsyncIO.cpp +@@ -25,7 +25,7 @@ + + namespace folly { + +-#if __has_include() ++#if __has_include() && defined FOLLY_WITH_LIBAIO + static constexpr bool has_aio = true; + using aio_type = AsyncIO; + #else diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 3208991c9a7c04..ab50da0cc04922 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( fix-unistd-include.patch fix-libunwind.patch fix-absolute-dir.patch + fix-has-include.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFastFloat.cmake") @@ -41,6 +42,9 @@ else() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "liburing" WITH_liburing + "libaio" WITH_libaio INVERTED_FEATURES "bzip2" CMAKE_DISABLE_FIND_PACKAGE_BZip2 "lz4" CMAKE_DISABLE_FIND_PACKAGE_LZ4 diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 1ef5403cd2d88f..81f561bdfe911c 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -25,20 +25,12 @@ "fmt", "gflags", "glog", - { - "name": "libaio", - "platform": "linux" - }, "libevent", "liblzma", { "name": "libunwind", "platform": "linux" }, - { - "name": "liburing", - "platform": "linux" - }, "openssl", { "name": "vcpkg-cmake", @@ -57,12 +49,26 @@ "bzip2" ] }, + "libaio": { + "description": "Support compile with libaio", + "supports": "linux", + "dependencies": [ + "libaio" + ] + }, "libsodium": { "description": "Support libsodium for cryto", "dependencies": [ "libsodium" ] }, + "liburing": { + "description": "Support compile with liburing", + "supports": "linux", + "dependencies": [ + "liburing" + ] + }, "lz4": { "description": "Support lz4 for compression", "dependencies": [ From 3a0e59f2bbdc06ba8c58f15d80cba8adb26535b6 Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Wed, 12 Mar 2025 00:32:36 -0700 Subject: [PATCH 08/13] version --- versions/baseline.json | 2 +- versions/f-/folly.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 19f2ff863d530b..ec880409adffeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1474,7 +1474,7 @@ }, "cachelib": { "baseline": "2024.07.15.00", - "port-version": 1 + "port-version": 0 }, "caf": { "baseline": "1.0.2", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 87becd6c7625d9..f8e6ae36bd965a 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f536681a98817d30d7422bcac625db893c429697", + "git-tree": "2fc6cc0a7657dddcbd5149d0d0682c5fd362bff8", "version-string": "2025.03.03.00", "port-version": 1 }, From 1f52f300c60c6d25c9a16a55a1d5c29d6b622345 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 12 Mar 2025 15:40:52 +0800 Subject: [PATCH 09/13] Remove duplicate version entry in cachelib.json --- versions/c-/cachelib.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/c-/cachelib.json b/versions/c-/cachelib.json index dc32b929f6c641..6c105bb257ec6b 100644 --- a/versions/c-/cachelib.json +++ b/versions/c-/cachelib.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "2b3bd35ac30115e6dd80a7e12413a7eabf8ac2fc", - "version-string": "2024.07.15.00", - "port-version": 1 - }, { "git-tree": "4c51a07152ad871b913be51d20251c0e92c7c440", "version-string": "2024.07.15.00", From 97930cbe7f2302b3d269d965619277d1741db9e2 Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 21 Mar 2025 03:29:22 -0700 Subject: [PATCH 10/13] add patch for liburing --- ports/liburing/add-basic-support.patch | 47 ++++++++++++++++++++++++++ ports/liburing/portfile.cmake | 1 + 2 files changed, 48 insertions(+) create mode 100644 ports/liburing/add-basic-support.patch diff --git a/ports/liburing/add-basic-support.patch b/ports/liburing/add-basic-support.patch new file mode 100644 index 00000000000000..641ba65d7bd531 --- /dev/null +++ b/ports/liburing/add-basic-support.patch @@ -0,0 +1,47 @@ +diff --git a/src/include/liburing.h b/src/include/liburing.h +index 49b4edf..a15bc33 100644 +--- a/src/include/liburing.h ++++ b/src/include/liburing.h +@@ -132,6 +132,16 @@ struct io_uring { + unsigned pad2; + }; + ++struct io_uring_zcrx_rq { ++ __u32 *khead; ++ __u32 *ktail; ++ __u32 rq_tail; ++ unsigned ring_entries; ++ ++ struct io_uring_zcrx_rqe *rqes; ++ void *ring_ptr; ++ }; ++ + /* + * Library interface + */ +@@ -265,6 +275,8 @@ int io_uring_register_file_alloc_range(struct io_uring *ring, + + int io_uring_register_napi(struct io_uring *ring, struct io_uring_napi *napi); + int io_uring_unregister_napi(struct io_uring *ring, struct io_uring_napi *napi); ++int io_uring_register_ifq(struct io_uring *ring, ++ struct io_uring_zcrx_ifq_reg *reg); + + int io_uring_register_clock(struct io_uring *ring, + struct io_uring_clock_register *arg); +diff --git a/src/register.c b/src/register.c +index 0fff208..20a624c 100644 +--- a/src/register.c ++++ b/src/register.c +@@ -422,6 +422,12 @@ int io_uring_clone_buffers(struct io_uring *dst, struct io_uring *src) + return io_uring_clone_buffers_offset(dst, src, 0, 0, 0, 0); + } + ++int io_uring_register_ifq(struct io_uring *ring, ++ struct io_uring_zcrx_ifq_reg *reg) ++ { ++ return do_register(ring, IORING_REGISTER_ZCRX_IFQ, reg, 1); ++ } ++ + int io_uring_resize_rings(struct io_uring *ring, struct io_uring_params *p) + { + unsigned sq_head, sq_tail; diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 1e6c7bec3d9739..c5d08bd2aa7d96 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( disable-tests-and-examples.patch ${SYNC_ZCRX_CHANGES_1} ${SYNC_ZCRX_CHANGES_2} + add-basic-support.patch # https://github.com/axboe/liburing/commit/d7ec4ce3421fbbdaba07426d589b72e204ac92e9 ) # https://github.com/axboe/liburing/blob/liburing-2.8/src/Makefile#L13 From 815ac3cbe7adb5db5e833ca58529e05d130ca8e0 Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 21 Mar 2025 03:30:17 -0700 Subject: [PATCH 11/13] update version --- versions/f-/folly.json | 2 +- versions/l-/liburing.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/f-/folly.json b/versions/f-/folly.json index be491e331f04d3..2164afffc87007 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2fc6cc0a7657dddcbd5149d0d0682c5fd362bff8", + "git-tree": "474ccfa3eb2150b92692951106dffa707f2eae0e", "version-string": "2025.03.17.00", "port-version": 1 }, diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 79631efa4f9b3f..6c1792a1c3e4c0 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0f92bbd879f63b39177cc53a989ceb5379bca49b", + "git-tree": "407de8efd734478970668239ff668e47ecf69735", "version": "2.9", "port-version": 0 }, From 7d72445a2b2b51c7addf4f7145da11b2f55eabba Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 21 Mar 2025 03:54:45 -0700 Subject: [PATCH 12/13] update patch --- ports/folly/fix-has-include.patch | 52 ++----------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/ports/folly/fix-has-include.patch b/ports/folly/fix-has-include.patch index b6d3cae281c50b..897243111f3132 100644 --- a/ports/folly/fix-has-include.patch +++ b/ports/folly/fix-has-include.patch @@ -1,15 +1,8 @@ diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake -index e41c128..cdba5d8 100644 +index e41c128..5117a65 100644 --- a/CMake/folly-deps.cmake +++ b/CMake/folly-deps.cmake -@@ -151,12 +151,14 @@ if(WITH_libaio) - find_package(LibAIO) - list(APPEND FOLLY_LINK_LIBRARIES ${LIBAIO_LIBRARIES}) - list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBAIO_INCLUDE_DIRS}) -+ add_compile_options(-DFOLLY_WITH_LIBAIO) - endif() - - if(WITH_liburing) +@@ -157,6 +157,7 @@ if(WITH_liburing) find_package(LibUring) list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES}) list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS}) @@ -17,34 +10,8 @@ index e41c128..cdba5d8 100644 endif() if(NOT CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium) -diff --git a/folly/io/async/AsyncIO.cpp b/folly/io/async/AsyncIO.cpp -index 93cda44..b2b466b 100644 ---- a/folly/io/async/AsyncIO.cpp -+++ b/folly/io/async/AsyncIO.cpp -@@ -35,7 +35,7 @@ - #include - #endif - --#if __has_include() -+#if __has_include() && defined FOLLY_WITH_LIBAIO - - // debugging helpers - namespace { -diff --git a/folly/io/async/AsyncIO.h b/folly/io/async/AsyncIO.h -index b1a6f52..2d1d99c 100644 ---- a/folly/io/async/AsyncIO.h -+++ b/folly/io/async/AsyncIO.h -@@ -18,7 +18,7 @@ - - #include - --#if __has_include() -+#if __has_include() && defined FOLLY_WITH_LIBAIO - - #include - diff --git a/folly/io/async/Liburing.h b/folly/io/async/Liburing.h -index 8e81aaa..92f0ddf 100644 +index 8e81aaa..bb6060e 100644 --- a/folly/io/async/Liburing.h +++ b/folly/io/async/Liburing.h @@ -16,7 +16,7 @@ @@ -56,16 +23,3 @@ index 8e81aaa..92f0ddf 100644 #define FOLLY_HAS_LIBURING 1 #else #define FOLLY_HAS_LIBURING 0 -diff --git a/folly/io/async/SimpleAsyncIO.cpp b/folly/io/async/SimpleAsyncIO.cpp -index 807a2be..442c9ad 100644 ---- a/folly/io/async/SimpleAsyncIO.cpp -+++ b/folly/io/async/SimpleAsyncIO.cpp -@@ -25,7 +25,7 @@ - - namespace folly { - --#if __has_include() -+#if __has_include() && defined FOLLY_WITH_LIBAIO - static constexpr bool has_aio = true; - using aio_type = AsyncIO; - #else From 6536e5337780b3f8115ba4d323965cd15e9d5a6c Mon Sep 17 00:00:00 2001 From: LilyWangLL <494550702@qq.com> Date: Fri, 21 Mar 2025 03:55:04 -0700 Subject: [PATCH 13/13] update version --- versions/f-/folly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 2164afffc87007..e95f9905dd7642 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "474ccfa3eb2150b92692951106dffa707f2eae0e", + "git-tree": "6724c01126e4de2d5014252336e7e23109d4c33b", "version-string": "2025.03.17.00", "port-version": 1 },