From: Luca Boccassi <bluca@debian.org>
Date: Mon, 29 Apr 2024 19:25:34 +0000 (+0100)
Subject: meson: bump libbpf dependency to 1.4.0 when using gcc
X-Git-Tag: v256-rc2~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c699c61ca8098e3a0b522119360c20dd232c85a;p=thirdparty%2Fsystemd.git

meson: bump libbpf dependency to 1.4.0 when using gcc

bpf_core_type_id_kernel() needs libbpf 1.4.0 when building with gcc
rather than clang, so bump the dependency accordingly.

More precisely, the following change is needed:

https://github.com/libbpf/libbpf/commit/b19fdbf1be21a28f88740375a575ebd9dfbea68f

Related to: https://github.com/systemd/systemd/issues/31869

Follow-up for 8aee931e7ae1adb01eeac0e1e4c0aef6ed3969ec
---

diff --git a/meson.build b/meson.build
index 547039064a1..78bd252f901 100644
--- a/meson.build
+++ b/meson.build
@@ -1056,7 +1056,7 @@ bpf_framework = get_option('bpf-framework')
 bpf_compiler = get_option('bpf-compiler')
 libbpf = dependency('libbpf',
                     required : bpf_framework,
-                    version : bpf_compiler == 'gcc' ? '>= 1.0.0' : '>= 0.1.0')
+                    version : bpf_compiler == 'gcc' ? '>= 1.4.0' : '>= 0.1.0')
 conf.set10('HAVE_LIBBPF', libbpf.found())
 
 if not libbpf.found()