From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 12 Jan 2022 13:42:18 +0000 (+0900)
Subject: meson: require bpftool version >= 5.6
X-Git-Tag: v251-rc1~508^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea78d2fb11cc745874c93fb41ce29c2aa37e6a6c;p=thirdparty%2Fsystemd.git

meson: require bpftool version >= 5.6

Closes #22051.
---

diff --git a/meson.build b/meson.build
index 910862ed367..a0ce462f317 100644
--- a/meson.build
+++ b/meson.build
@@ -1005,7 +1005,11 @@ else
 
         # Debian installs this in /usr/sbin/ which is not in $PATH.
         # We check for 'bpftool' first, honouring $PATH, and in /usr/sbin/ for Debian.
-        bpftool = find_program('bpftool', '/usr/sbin/bpftool', required : bpf_framework_required)
+        # We use 'bpftool gen' subcommand, it was added by 985ead416df39d6fe8e89580cc1db6aa273e0175 (v5.6).
+        bpftool = find_program('bpftool',
+                               '/usr/sbin/bpftool',
+                               required : bpf_framework_required,
+                               version : '>= 5.6')
 
         deps_found = libbpf.found() and clang.found() and llvm_strip.found() and bpftool.found()
         # Can build BPF program from source code in restricted C