ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

ipmitool: fix build on -fno-common toolchains

Browse Source 
Without the change build fails on toolchains like clang-13 which
switch to -fno-common by default:

    $ nix build --impure --expr 'with import ./. {}; ipmitool.override { stdenv = clang13Stdenv; }'
    ...
    ld: ../lib/.libs/libipmitool.a(ipmi_hpmfwupg.o):/build/ipmitool-1.8.18/lib/../include/ipmitool/ipmi_hpmfwupg.h:803:
      multiple definition of `gVersionInfo'; ipmitool.o:/build/ipmitool-1.8.18/src/../include/ipmitool/ipmi_hpmfwupg.h:803: first defined here

Pull upstream fix to move definition to .c file.
This commit is contained in:
Sergei Trofimovich 2022-05-06 09:01:17 +01:00
parent bfd06fd04d
commit 1d02b2cc90
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/system/ipmitool/default.nix
View File

@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch";
sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY=";
})
# Pull upstream patch to support upstream gcc-10:
# https://github.com/ipmitool/ipmitool/pull/180
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/ipmitool/ipmitool/commit/51c7e0822f531469cf860dfa5d010c87b284b747.patch";
sha256 = "sha256-5UszUdVw3s2S5RCm5Exq4mqDqiYcN62in1O5+TZu9YA=";
})
];
buildInputs = [ openssl ];