From abcd1470376cdb5f84e732816a33262cbb845622 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:32:01 +0100 Subject: [PATCH 1/3] [liburing] Update to 2.8 --- ports/liburing/disable-tests-and-examples.patch | 2 +- ports/liburing/fix-configure.patch | 8 ++++---- ports/liburing/portfile.cmake | 4 ++-- ports/liburing/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/liburing.json | 5 +++++ 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ports/liburing/disable-tests-and-examples.patch b/ports/liburing/disable-tests-and-examples.patch index 827d80e9cfb178..0d996201357104 100644 --- a/ports/liburing/disable-tests-and-examples.patch +++ b/ports/liburing/disable-tests-and-examples.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 686be4f..28d0a7f 100644 +index 6a2d63b..cb5a138 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,6 @@ default: all diff --git a/ports/liburing/fix-configure.patch b/ports/liburing/fix-configure.patch index ae718c0972d7d0..e567a95ff6ea31 100644 --- a/ports/liburing/fix-configure.patch +++ b/ports/liburing/fix-configure.patch @@ -1,5 +1,5 @@ diff --git a/configure b/configure -index 88b8ee7..bf9312f 100755 +index 4794306..76e6334 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ for opt do @@ -11,9 +11,9 @@ index 88b8ee7..bf9312f 100755 ;; --cc=*) cc="$optarg" ;; -@@ -28,10 +28,12 @@ for opt do +@@ -30,10 +30,12 @@ for opt do ;; - --use-libc) use_libc=yes + --enable-sanitizer) use_sanitizer=yes ;; + --enable-shared) ENABLE_SHARED=1 + ;; @@ -26,7 +26,7 @@ index 88b8ee7..bf9312f 100755 ;; esac done -@@ -130,6 +132,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak +@@ -133,6 +135,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 diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 486aeb020bfe63..270d1f4121fd5b 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -2,14 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing REF "liburing-${VERSION}" - SHA512 c65146ee53defba4f9b752674be8489757f60be0855b361c6d1136119c74803351e5ccc8a1890c0777bfe61da4c0fd997230fc8817ff3929a7e2186b389cdc28 + SHA512 d40d041b94bb0f004bd92890988c0e4b8a7bb9ae43659790ee4b19e5417f7dc5b9a554489834769ee71edfc6a44bcd87a5fca34845f61cc80e4e8e588c6950ec HEAD_REF master PATCHES fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED disable-tests-and-examples.patch ) -# https://github.com/axboe/liburing/blob/liburing-2.7/src/Makefile#L13 +# https://github.com/axboe/liburing/blob/liburing-2.8/src/Makefile#L13 set(ENV{CFLAGS} "$ENV{CFLAGS} -O3 -Wall -Wextra -fno-stack-protector") # note: check ${SOURCE_PATH}/liburing.spec before updating configure options diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 5548bd25ed57a3..82812b47c43206 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liburing", - "version": "2.7", - "port-version": 1, + "version": "2.8", "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))", diff --git a/versions/baseline.json b/versions/baseline.json index c5db8207a739e6..0d849efd1c54b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5281,8 +5281,8 @@ "port-version": 3 }, "liburing": { - "baseline": "2.7", - "port-version": 1 + "baseline": "2.8", + "port-version": 0 }, "libusb": { "baseline": "1.0.27", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 486654d28186d8..e9695a0f0cb075 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b7b0de9c33f82deef77bebb5c69d8628dd4c9c9", + "version": "2.8", + "port-version": 0 + }, { "git-tree": "aadbba17ecb5910ff9da4e903f822e700aa29f8d", "version": "2.7", From fb3edc5b933bd885de1c7c891ea59b4ca7184ac6 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:53:32 +0100 Subject: [PATCH 2/3] Fix Revert disable-tests-and-examples.patch since it is unchanged --- ports/liburing/disable-tests-and-examples.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/liburing/disable-tests-and-examples.patch b/ports/liburing/disable-tests-and-examples.patch index 0d996201357104..827d80e9cfb178 100644 --- a/ports/liburing/disable-tests-and-examples.patch +++ b/ports/liburing/disable-tests-and-examples.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 6a2d63b..cb5a138 100644 +index 686be4f..28d0a7f 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,6 @@ default: all From 1522047f22e0e7554b56ba17ffe2a3a1e799dc34 Mon Sep 17 00:00:00 2001 From: Fabio Buracchi <45599613+buracchi@users.noreply.github.com> Date: Fri, 22 Nov 2024 19:19:46 +0100 Subject: [PATCH 3/3] Update version database --- versions/l-/liburing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index e9695a0f0cb075..20a28e7bc46fc0 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7b7b0de9c33f82deef77bebb5c69d8628dd4c9c9", + "git-tree": "d7ec4cc6b825d55cc4c5f2768d85d01398735f64", "version": "2.8", "port-version": 0 },