From 1d3b358ad9d6e19b69758bd23d19c2f6987c7f10 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Jul 04 2024 08:17:39 +0000
Subject: Merge remote-tracking branch 'fedora/rawhide' into c10s-sig-hyperscale


---

diff --git a/systemd.spec b/systemd.spec
index 8761ed1..a741074 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -139,6 +139,7 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  clang
 BuildRequires:  coreutils
+BuildRequires:  rpmdevtools
 BuildRequires:  libcap-devel
 BuildRequires:  libmount-devel
 BuildRequires:  libfdisk-devel
@@ -175,6 +176,9 @@ BuildRequires:  libcurl-devel
 BuildRequires:  kmod-devel
 BuildRequires:  elfutils-devel
 BuildRequires:  openssl-devel
+%if 0%{?fedora} >= 41
+BuildRequires:  openssl-devel-engine
+%endif
 %if %{with gnutls}
 BuildRequires:  gnutls-devel
 %endif
@@ -227,6 +231,7 @@ BuildRequires:  valgrind-devel
 %ifnarch %ix86
 # bpftool is not built for i368
 BuildRequires:  bpftool
+BuildRequires:  kernel-devel
 %global have_bpf 1
 %endif
 
@@ -706,6 +711,28 @@ cp %SOURCE100 %SOURCE101 /tmp/selinux
 %global ntpvendor %(source /etc/os-release; echo ${ID})
 %{!?ntpvendor: echo 'NTP vendor zone is not set!'; exit 1}
 
+VMLINUX_H_PATH=''
+
+%if 0%{?have_bpf}
+
+%global find_vmlinux_h %{expand:
+import functools, glob, subprocess
+def cmp(a, b):
+  c = subprocess.call(["rpmdev-vercmp", a, b], stdout=subprocess.DEVNULL)
+  return {0:0, 11:+1, 12:-1}[c]
+choices = list(glob.glob("/usr/src/kernels/*/vmlinux.h"))
+assert choices
+print(max(choices, key=functools.cmp_to_key(cmp)))
+}
+
+# The build fails on ppc64le with
+# "GCC error "Must specify a BPF target arch via __TARGET_ARCH_xxx".
+# TODO: Remove this when libbpf checks for __powerpc64__ macro.
+%ifnarch ppc64le
+VMLINUX_H_PATH=$(%python3 -c '%find_vmlinux_h')
+%endif
+%endif
+
 CONFIGURE_OPTS=(
         -Dmode=%[%{with upstream}?"developer":"release"]
         -Dsysvinit-path=/etc/rc.d/init.d
@@ -723,6 +750,8 @@ CONFIGURE_OPTS=(
         -Dima=true
         -Dselinux=enabled
         -Dbpf-framework=%[0%{?have_bpf}?"enabled":"disabled"]
+        -Dvmlinux-h=%[0%{?have_bpf}?"auto":"disabled"]
+        -Dvmlinux-h-path="$VMLINUX_H_PATH"
         -Dapparmor=disabled
         -Dpolkit=enabled
         -Dxz=%[%{with xz}?"enabled":"disabled"]