From: Yu Watanabe Date: Wed, 19 Jan 2022 09:46:09 +0000 (+0900) Subject: meson: skip to search clang, llvm-string, and bpftool, if libbpf not found X-Git-Tag: v251-rc1~500 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30b6f7d714ff961d69d881fd31717e93e30b5c48;p=thirdparty%2Fsystemd.git meson: skip to search clang, llvm-string, and bpftool, if libbpf not found Prompted by https://github.com/systemd/systemd/pull/22093#issuecomment-1016254914. --- diff --git a/meson.build b/meson.build index 94b67f6b714..0abdd366163 100644 --- a/meson.build +++ b/meson.build @@ -984,7 +984,7 @@ bpf_framework_required = want_bpf_framework == 'true' libbpf = dependency('libbpf', required : bpf_framework_required, version : '>= 0.2') conf.set10('HAVE_LIBBPF', libbpf.found()) -if want_bpf_framework == 'false' +if want_bpf_framework == 'false' or not libbpf.found() conf.set10('BPF_FRAMEWORK', 0) else # Support 'versioned' clang/llvm-strip binaries, as seen on Debian/Ubuntu @@ -1030,7 +1030,7 @@ else required : bpf_framework_required, version : '>= 5.6') - deps_found = libbpf.found() and clang_found and clang_supports_bpf and clang_supports_flags and llvm_strip.found() and bpftool.found() + deps_found = clang_found and clang_supports_bpf and clang_supports_flags and llvm_strip.found() and bpftool.found() # Can build BPF program from source code in restricted C conf.set10('BPF_FRAMEWORK', deps_found)