From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 27 Jul 2021 14:20:40 +0000 (+0200)
Subject: meson: adjust comment about find_program() usage
X-Git-Tag: v250-rc1~913^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68e101da7acd2a595487a1df5c37a23e41383161;p=thirdparty%2Fsystemd.git

meson: adjust comment about find_program() usage

The FIXME was not correct: with 'dirs' we'd put the fixed path first
(see the docs for find_program()).
---

diff --git a/meson.build b/meson.build
index 84f288c6647..5ba92bdf6f4 100644
--- a/meson.build
+++ b/meson.build
@@ -948,9 +948,11 @@ if want_bpf_framework == 'false'
 else
         clang = find_program('clang', required : bpf_framework_required)
         llvm_strip = find_program('llvm-strip', required : bpf_framework_required)
-        # Debian installs this in /usr/sbin/ which is not in $PATH
-        # FIXME: use the 'dirs' parameter once we bump Meson version to >= 0.53
+
+        # 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)
+
         bpf_arches = ['x86_64']
         deps_found = libbpf.found() and clang.found() and llvm_strip.found() and bpftool.found()
         # Can build BPF program from source code in restricted C