Skip to content

Commit

Permalink
[liburing] update to 2.2 (microsoft#26801)
Browse files Browse the repository at this point in the history
* [liburing] update to 2.2

* update version
  • Loading branch information
JonLiu1993 authored Sep 15, 2022
1 parent 6ff1bfa commit 71115af
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 25 deletions.
20 changes: 11 additions & 9 deletions ports/liburing/fix-configure.patch
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
diff --git a/configure b/configure
index 3b96cde..56d5cb0 100755
index 2c2441b..620c443 100644
--- a/configure
+++ b/configure
@@ -18,16 +18,18 @@ for opt do
@@ -14,7 +14,7 @@ for opt do
;;
--mandir=*) mandir="$optarg"
--includedir=*) includedir="$optarg"
;;
- --datadir=*) datadir="$optarg"
+ --datarootdir=*) datadir="$optarg"
- --libdir=*) libdir="$optarg"
+ --datarootdir=*) libdir="$optarg"
;;
--cc=*) cc="$optarg"
--libdevdir=*) libdevdir="$optarg"
;;
--cxx=*) cxx="$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"
Expand All @@ -25,7 +27,7 @@ index 3b96cde..56d5cb0 100755
;;
esac
done
@@ -119,6 +121,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak
@@ -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
Expand Down
11 changes: 0 additions & 11 deletions ports/liburing/fix-spec-version.patch

This file was deleted.

5 changes: 2 additions & 3 deletions ports/liburing/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO axboe/liburing
REF 41a61c97c2e3df4475c93fdf5026d575ce3f1377 #liburing-2.1
SHA512 adbfee9a775ff0977c192b52f5cc2c52b2b40bf5e7c0c1153d88b7767889c7c8a39863da0bce3ebed0f396a453e879633ecf1c79f4f2c4f89407ff896d8b6222
REF dda4848a9911120a903bef6284fb88286f4464c9 #liburing-2.2
SHA512 c2e4969ffb895996bf7465ce86143d4d3401a052624ec19580d34e8adbb2b57801e03541493f61e19a3137984714db645b135b1bc3b41987bccfd926bb486c09
HEAD_REF master
PATCHES
fix-spec-version.patch # update version value for pkgconfig(.pc) files
fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED
)

Expand Down
2 changes: 1 addition & 1 deletion ports/liburing/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "liburing",
"version": "2.1",
"version": "2.2",
"description": "Linux-native io_uring I/O access library",
"homepage": "https://github.com/axboe/liburing",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4249,7 +4249,7 @@
"port-version": 3
},
"liburing": {
"baseline": "2.1",
"baseline": "2.2",
"port-version": 0
},
"libusb": {
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": "8d783b3db24821bcd85fcdbb5673b03613653e01",
"version": "2.2",
"port-version": 0
},
{
"git-tree": "2abcbd2b104e5dbd5406cac8f3f9a3ae7fc47647",
"version": "2.1",
Expand Down

0 comments on commit 71115af

Please sign in to comment.