systemd: re-enable bpf-framework

martinetd · martinetd · commit ef593db9caff · 2024-07-20T20:50:34.000+09:00
systemd meson.build apparently didn't check properly that the option was enabled in all code paths, so it was possible to build systemd such as --version would have -BPF_FRAMEWORK (properly disabled in config.h) with -Dbpf-framework=enabled. Fix the failing check, which was `clang -target bpf` breaking with zerocallusedregs hardening -- this is apparently a known problem as it's disabled in quite a few other packages that mention bpf in comment above the exception... Link: systemd/systemd#33793
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
@@ -412,7 +412,8 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523
     "trivialautovarinit"
-  ];
+    # breaks clang -target bpf; should be fixed to filter target?
+  ] ++ (lib.optional withLibBPF "zerocallusedregs");
 
   nativeBuildInputs =
     [

Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,8 @@ stdenv.mkDerivation (finalAttrs: {`
`412`	`412`	`hardeningDisable = [`
`413`	`413`	`# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523`
`414`	`414`	`"trivialautovarinit"`
`415`		`- ];`
	`415`	`+ # breaks clang -target bpf; should be fixed to filter target?`
	`416`	`+ ] ++ (lib.optional withLibBPF "zerocallusedregs");`
`416`	`417`
`417`	`418`	`nativeBuildInputs =`
`418`	`419`	`[`