From 85f216ff85be24a945c375d78a3db1df7c5d308c Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 12 May 2022 07:39:01 +0800 Subject: [PATCH] [liburing] Update to version 2.1 (#24637) * [liburing] Update to version 2.1 * format vcpkg.json * x-add-version * apply suggestion * version Co-authored-by: Lily Wang --- ports/liburing/fix-spec-version.patch | 4 ++-- ports/liburing/portfile.cmake | 23 +++++++++++++---------- ports/liburing/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/liburing.json | 5 +++++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ports/liburing/fix-spec-version.patch b/ports/liburing/fix-spec-version.patch index 9acb1fc4043..cb495f856c1 100644 --- a/ports/liburing/fix-spec-version.patch +++ b/ports/liburing/fix-spec-version.patch @@ -4,8 +4,8 @@ index fa4d970..8607074 100644 +++ b/liburing.spec @@ -1,5 +1,5 @@ Name: liburing --Version: 0.7 -+Version: 2.0 +-Version: 2.0 ++Version: 2.1 Release: 1%{?dist} Summary: Linux-native io_uring I/O access library License: (GPLv2 with exceptions and LGPLv2+) or MIT diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 276f68fb48a..72f6d07eb3c 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing - REF liburing-2.0 - SHA512 8a7b37600246d44a94d3fed1ca4bb60e76f9ddc60bd3c237e600b60e77961a1125c8a1f230cb7569f959acf10b68b91aafb4935c1c2fd13d5df7373b374e47f5 + REF 41a61c97c2e3df4475c93fdf5026d575ce3f1377 #liburing-2.1 + SHA512 adbfee9a775ff0977c192b52f5cc2c52b2b40bf5e7c0c1153d88b7767889c7c8a39863da0bce3ebed0f396a453e879633ecf1c79f4f2c4f89407ff896d8b6222 HEAD_REF master PATCHES fix-spec-version.patch # update version value for pkgconfig(.pc) files @@ -11,22 +11,25 @@ vcpkg_from_github( # note: check ${SOURCE_PATH}/liburing.spec before updating configure options vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + 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}) +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 + 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}/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/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 37403d70c9d..d2fb6d7f1d2 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,8 +1,8 @@ { "name": "liburing", - "version": "2.0", - "port-version": 3, + "version": "2.1", "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", + "license": null, "supports": "linux" } diff --git a/versions/baseline.json b/versions/baseline.json index 9f6d6e0e59e..f461dce88af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4125,8 +4125,8 @@ "port-version": 3 }, "liburing": { - "baseline": "2.0", - "port-version": 3 + "baseline": "2.1", + "port-version": 0 }, "libusb": { "baseline": "1.0.26", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 2fc0750a765..50c21042134 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2abcbd2b104e5dbd5406cac8f3f9a3ae7fc47647", + "version": "2.1", + "port-version": 0 + }, { "git-tree": "10bf5144950610a1f587342c5107bf4fdfb52658", "version": "2.0",