From: Michael Biebl <biebl@debian.org>
Date: Fri, 22 Mar 2024 12:26:45 +0000 (+0100)
Subject: Fix bpf-framework build failure with gcc-bpf
X-Git-Tag: v256-rc1~435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1df021927f119287985ac0cafefcfec9ead6d9ae;p=thirdparty%2Fsystemd.git

Fix bpf-framework build failure with gcc-bpf

The -mkernel option was dropped in
https://github.com/gcc-mirror/gcc/commit/da445a5858299ed2a72af1089c225a438ab93ce2

We also need to ensure that the include paths are properly set for the
linux kernel headers.

Fixes: #31869
---

diff --git a/meson.build b/meson.build
index 1bedbd56056..e43ec9454d4 100644
--- a/meson.build
+++ b/meson.build
@@ -1693,7 +1693,6 @@ if conf.get('BPF_FRAMEWORK') == 1
                 '-std=gnu11',
                 '-fno-stack-protector',
                 '-O2',
-                '-mkernel=5.2',
                 '-mcpu=v3',
                 '-mco-re',
                 '-gbtf',
@@ -1742,7 +1741,7 @@ if conf.get('BPF_FRAMEWORK') == 1
 
         bpf_o_unstripped_cmd += ['-I.']
 
-        if not meson.is_cross_build() and bpf_compiler == 'clang'
+        if not meson.is_cross_build()
                 target_triplet_cmd = run_command('gcc', '-dumpmachine', check: false)
                 if target_triplet_cmd.returncode() == 0
                         target_triplet = target_triplet_cmd.stdout().strip()