From af29310a780e0a1ca0252143d23de4497a57e03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Wed, 10 May 2023 14:26:15 +0200 Subject: [PATCH] liburing: override "liburing" dependency name The pkg-config name of liburing is "liburing", so ideally it would be possible to use just dependency('liburing') to find either the system provided liburing or fall back to the subproject. However, that does not work since the liburing wrap project does not override or provide the "liburing" dependency name, so one has to use dependency('liburing', fallback: ['liburing', 'uring']) or dependency('liburing', 'uring') This change makes it possible to use dependency('liburing') with both system (pkg-config) and the wrapdb provided liburing. --- releases.json | 2 ++ subprojects/liburing.wrap | 2 +- subprojects/packagefiles/liburing/src/meson.build | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/releases.json b/releases.json index 18d2d3b47..fe52051d9 100644 --- a/releases.json +++ b/releases.json @@ -1350,9 +1350,11 @@ }, "liburing": { "dependency_names": [ + "liburing", "uring" ], "versions": [ + "2.3-2", "2.3-1", "2.2-2", "2.2-1", diff --git a/subprojects/liburing.wrap b/subprojects/liburing.wrap index 85984ad4e..d7be39569 100644 --- a/subprojects/liburing.wrap +++ b/subprojects/liburing.wrap @@ -6,4 +6,4 @@ source_hash = 60b367dbdc6f2b0418a6e0cd203ee0049d9d629a36706fcf91dfb9428bae23c8 patch_directory = liburing [provide] -uring = uring +dependency_names = liburing, uring diff --git a/subprojects/packagefiles/liburing/src/meson.build b/subprojects/packagefiles/liburing/src/meson.build index 71035cd51..0c6022017 100644 --- a/subprojects/packagefiles/liburing/src/meson.build +++ b/subprojects/packagefiles/liburing/src/meson.build @@ -16,3 +16,6 @@ liburing = library('uring', uring = declare_dependency(link_with: liburing, include_directories: inc) + +meson.override_dependency('liburing', uring) +meson.override_dependency('uring', uring)