From 196eb5312974580e085ffaf3eabc5393e4eb4c67 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 28 Jul 2025 12:31:35 +0200 Subject: [PATCH] kexec-tools: Only force ELFv2 on ppc64 when the platform settings aggree Fixes building for ELFv1. --- pkgs/by-name/ke/kexec-tools/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index 13d3f55f1f40..9c32fb24d70d 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -23,17 +23,19 @@ stdenv.mkDerivation rec { }; patches = [ - # Use ELFv2 ABI on ppc64be - (fetchpatch { - url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; - sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; - }) # Fix for static builds, will likely be removable on the next release (fetchpatch { url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=daa29443819d3045338792b5ba950ed90e79d7a5"; hash = "sha256-Nq5HIcLY6KSvvrs2sbfE/vovMbleJYElHW9AVRU5rSA="; }) ] + ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isAbiElfv2) [ + # Use ELFv2 ABI on ppc64be + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; + sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; + }) + ] ++ lib.optional (stdenv.hostPlatform.useLLVM or false) ./fix-purgatory-llvm-libunwind.patch; hardeningDisable = [