From bd291cb51144a0d09a08a2279b91467219a97017 Mon Sep 17 00:00:00 2001 From: Dennis Hezel Date: Thu, 23 May 2024 15:46:50 +0200 Subject: [PATCH] chore: Update liburing to 2.6 --- .../liburing/disable-tests-and-examples.patch | 13 ------- deps/liburing/fix-configure.patch | 37 ------------------- deps/liburing/portfile.cmake | 35 ------------------ deps/liburing/usage | 6 --- deps/liburing/vcpkg.json | 8 ---- 5 files changed, 99 deletions(-) delete mode 100644 deps/liburing/disable-tests-and-examples.patch delete mode 100644 deps/liburing/fix-configure.patch delete mode 100644 deps/liburing/portfile.cmake delete mode 100644 deps/liburing/usage delete mode 100644 deps/liburing/vcpkg.json diff --git a/deps/liburing/disable-tests-and-examples.patch b/deps/liburing/disable-tests-and-examples.patch deleted file mode 100644 index 7faef951..00000000 --- a/deps/liburing/disable-tests-and-examples.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 686be4f..28d0a7f 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,8 +8,6 @@ default: all - - all: - @$(MAKE) -C src -- @$(MAKE) -C test -- @$(MAKE) -C examples - - .PHONY: all install default clean test - .PHONY: FORCE cscope diff --git a/deps/liburing/fix-configure.patch b/deps/liburing/fix-configure.patch deleted file mode 100644 index 74dcb11d..00000000 --- a/deps/liburing/fix-configure.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/configure b/configure -index 2c2441b..2114f32 100755 ---- a/configure -+++ b/configure -@@ -20,7 +20,7 @@ for opt do - ;; - --mandir=*) mandir="$optarg" - ;; -- --datadir=*) datadir="$optarg" -+ --datarootdir=*) datadir="$optarg" - ;; - --cc=*) cc="$optarg" - ;; -@@ -28,10 +28,12 @@ for opt do - ;; - --nolibc) liburing_nolibc="yes" - ;; -+ --enable-shared) ENABLE_SHARED=1 -+ ;; -+ --enable-static) ENABLE_SHARED=0 -+ ;; - *) -- echo "ERROR: unknown option $opt" -- echo "Try '$0 --help' for more information" -- exit 1 -+ echo "WARNING: unknown option $opt" - ;; - esac - done -@@ -130,6 +132,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak - printf "# Configured with:" >> $config_host_mak - printf " '%s'" "$0" "$@" >> $config_host_mak - echo >> $config_host_mak -+echo "ENABLE_SHARED=${ENABLE_SHARED}" >> $config_host_mak - - do_cxx() { - # Run the compiler, capturing its output to the log. diff --git a/deps/liburing/portfile.cmake b/deps/liburing/portfile.cmake deleted file mode 100644 index eabe503b..00000000 --- a/deps/liburing/portfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH - SOURCE_PATH - REPO - axboe/liburing - REF - liburing-2.2 - SHA512 - 243e42b221115be7bc51d91d807aaaa545bb14709ceceee502a1b694a41bcef22ec660c11dc81eaddcc23a07748d6d6b5e8a13a670aed63b3aa660dfb849ac1e - HEAD_REF - master - PATCHES - fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED - disable-tests-and-examples.patch) - -# note: check ${SOURCE_PATH}/liburing.spec before updating configure options -vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE) -vcpkg_install_make() -vcpkg_fixup_pkgconfig() - -file( - INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) -file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -# note: {SOURCE_PATH}/src/Makefile makes liburing.so from liburing.a. For dynamic, remove intermediate file liburing.a -# when install is finished. -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/liburing.a" "${CURRENT_PACKAGES_DIR}/lib/liburing.a") -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man2") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7") diff --git a/deps/liburing/usage b/deps/liburing/usage deleted file mode 100644 index bbfbaafb..00000000 --- a/deps/liburing/usage +++ /dev/null @@ -1,6 +0,0 @@ -The package liburing can be imported via CMake FindPkgConfig module: - - find_package(PkgConfig) - pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0) - - target_link_libraries(main PRIVATE PkgConfig::liburing) diff --git a/deps/liburing/vcpkg.json b/deps/liburing/vcpkg.json deleted file mode 100644 index 628f8243..00000000 --- a/deps/liburing/vcpkg.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "liburing", - "version": "2.2", - "description": "Linux-native io_uring I/O access library", - "homepage": "https://github.com/axboe/liburing", - "license": "MIT", - "supports": "linux" -}