Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[liburing] Update to 2.8 #42313

Merged
merged 3 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ports/liburing/fix-configure.patch
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
+ ;;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/liburing/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ports/liburing/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"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))",

Check notice on line 6 in ports/liburing/vcpkg.json

View workflow job for this annotation

GitHub Actions / Check

SPDX deprecated license identifier LGPL-2.1. If you feel able to do so, please consider replacing it. Updated license identifiers can be found at https://spdx.org/licenses/.

Check notice on line 6 in ports/liburing/vcpkg.json

View workflow job for this annotation

GitHub Actions / Check

SPDX deprecated license identifier GPL-2.0. If you feel able to do so, please consider replacing it. Updated license identifiers can be found at https://spdx.org/licenses/.
"supports": "linux"
}
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/liburing.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d7ec4cc6b825d55cc4c5f2768d85d01398735f64",
"version": "2.8",
"port-version": 0
},
{
"git-tree": "aadbba17ecb5910ff9da4e903f822e700aa29f8d",
"version": "2.7",
Expand Down