shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

meson: look for bpftool in /usr/sbin too

Browse Source 
On Debian, bpftool is installed in /usr/sbin, which is not in $PATH for
non-root users by default, so finding it fails.
Add a secondary, hard-coded '/usr/sbin/bpftool' after 'bpftool' so that
meson can find it.

https://packages.debian.org/sid/amd64/bpftool/filelist
This commit is contained in:
Luca Boccassi 2021-05-23 13:43:38 +01:00 committed by Luca Boccassi
parent dd30da133a
commit 936cfad7e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -909,7 +909,9 @@ if want_bpf_framework == 'false'
else
clang = find_program('clang', required : bpf_framework_required)
llvm_strip = find_program('llvm-strip', required : bpf_framework_required)
bpftool = find_program('bpftool', 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
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