[Stable-9.2.1,08/41] meson.build: Disallow libnfs v6 to fix the broken macOS build

Commit Message

Michael Tokarev Jan. 27, 2025, 2:17 p.m. UTC

From: Thomas Huth <[e-mail]>

The macOS builds in our CI (and possibly other very recent distros)
are currently broken since the update to libnfs version 6 there.
That version apparently comes with a big API breakage. v5.0.3 was
the final release of the old API (see the libnfs commit here:
https://github.com/sahlberg/libnfs/commit/4379837 ).

Disallow version 6.x for now to get the broken CI job working
again. Once somebody had enough time to adapt our code in
block/nfs.c, we can revert this change again.

Message-ID: <[e-mail]>
Reviewed-by: Daniel P. Berrangé <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Signed-off-by: Thomas Huth <[e-mail]>
(cherry picked from commit e2d98f257138b83b6a492d1da5847a7fe0930d10)
Signed-off-by: Michael Tokarev <[e-mail]>

Patch

diff --git a/meson.build b/meson.build
index 147097c652..7a3faca61d 100644
--- a/meson.build
+++ b/meson.build
@@ -1122,7 +1122,7 @@  endif
 
 libnfs = not_found
 if not get_option('libnfs').auto() or have_block
-  libnfs = dependency('libnfs', version: '>=1.9.3',
+  libnfs = dependency('libnfs', version: ['>=1.9.3', '<6.0.0'],
                       required: get_option('libnfs'),
                       method: 'pkg-config')
 endif