From 4a77c8f8fbac6fd42d0c94565b5671d71dfcd4c4 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 4 Apr 2024 13:16:08 -1000
Subject: [PATCH] meson.build: Update libbpf and bpftool version requirements

The recent compat additions require new libbpf and bpftool. Update the
requirements.

- libbpf >= 1.4
- bpftool >= 7.4
---
 meson-scripts/get_bpftool_ver |  3 +++
 meson.build                   | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100755 meson-scripts/get_bpftool_ver

diff --git a/meson-scripts/get_bpftool_ver b/meson-scripts/get_bpftool_ver
new file mode 100755
index 000000000..2678dfb4f
--- /dev/null
+++ b/meson-scripts/get_bpftool_ver
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+"$1" --version | sed -nr 's/^.*bpftool v([\.0-9]*)(git)?( .*)?$/\1/p'
diff --git a/meson.build b/meson.build
index 27a181e1d..009ae14e4 100644
--- a/meson.build
+++ b/meson.build
@@ -21,6 +21,8 @@ endif
 
 get_clang_ver = find_program(join_paths(meson.current_source_dir(),
                                         'meson-scripts/get_clang_ver'))
+get_bpftool_ver = find_program(join_paths(meson.current_source_dir(),
+                                          'meson-scripts/get_bpftool_ver'))
 bpftool_build_skel = find_program(join_paths(meson.current_source_dir(),
                                              'meson-scripts/bpftool_build_skel'))
 get_sys_incls = find_program(join_paths(meson.current_source_dir(),
@@ -135,10 +137,7 @@ if libbpf_a != ''
     cc.find_library('z'),
     cc.find_library('zstd')]
 else
-  libbpf_dep = dependency('libbpf', version: '>=1.2.2')
-  if libbpf_dep.version().version_compare('<1.3')
-    warning('libbpf <1.3 does not support RESIZE_ARRAY(), expect breakages in schedulers that use them')
-  endif
+  libbpf_dep = dependency('libbpf', version: '>=1.4')
 endif
 
 if get_option('kernel_headers') != ''
@@ -173,6 +172,12 @@ if should_build_bpftool
               command: [build_bpftool, jq, make, bpftool_path, '@0@'.format(make_jobs)],
               build_by_default: true)
 else
+  bpftool_ver = run_command(get_bpftool_ver, bpftool_exe_path, check: true).stdout().strip()
+  bpftool_maj = bpftool_ver.split('.')[0].to_int()
+  bpftool_min = bpftool_ver.split('.')[1].to_int()
+  if bpftool_maj < 7 or (bpftool_maj == 7 and bpftool_min < 4)
+    error('bpftool >= 7.4 required (@0@ ver=@1@)'.format(bpftool_exe_path, bpftool_ver))
+  endif
   # this is a noop when we're not building bpftool ourselves
   bpftool_target = custom_target('bpftool_target',
               output: '@PLAINNAME@.__PHONY__',