From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 15 May 2022 18:38:45 +0000 (+0900)
Subject: meson: always get libbpf include directory from pkgconfig
X-Git-Tag: v251~30^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fe37dbdcff8dc6589488e9ad7720f674144e777;p=thirdparty%2Fsystemd.git

meson: always get libbpf include directory from pkgconfig
---

diff --git a/src/core/bpf/meson.build b/src/core/bpf/meson.build
index 849f092fcf6..c88e4577169 100644
--- a/src/core/bpf/meson.build
+++ b/src/core/bpf/meson.build
@@ -33,11 +33,7 @@ cpu_arch_defines = {
 clang_arch_flags = cpu_arch_defines.get(host_machine.cpu_family(),
                                         ['-D__@0@__'.format(host_machine.cpu_family())])
 
-if meson.version().version_compare('>= 0.58')
-        libbpf_include_dir = libbpf.get_variable('includedir')
-else
-        libbpf_include_dir = libbpf.get_variable(pkgconfig : 'includedir')
-endif
+libbpf_include_dir = libbpf.get_variable(pkgconfig : 'includedir')
 
 bpf_o_unstripped_cmd = [
         clang,