diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-12-25 22:33:28 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-12-25 22:38:47 +0000 |
| commit | d32fcc684c2defb9599fb0b17e492225bef016e0 (patch) | |
| tree | 148144d133da278ed0f53a7a3973fd8b735b7f33 /pkgs/os-specific/linux/multipath-tools | |
| parent | 9ec14cd78d0618d6e3b1e68e257da262e05a3023 (diff) | |
| download | nixpkgs-d32fcc684c2defb9599fb0b17e492225bef016e0.tar nixpkgs-d32fcc684c2defb9599fb0b17e492225bef016e0.tar.gz nixpkgs-d32fcc684c2defb9599fb0b17e492225bef016e0.tar.bz2 nixpkgs-d32fcc684c2defb9599fb0b17e492225bef016e0.tar.lz nixpkgs-d32fcc684c2defb9599fb0b17e492225bef016e0.tar.xz nixpkgs-d32fcc684c2defb9599fb0b17e492225bef016e0.tar.zst nixpkgs-d32fcc684c2defb9599fb0b17e492225bef016e0.zip | |
multipath-tools: pull upstream fix for -fno-cmmon toolchains
Without the change build on clang-12 (and upstream gcc-10+) fails as:
$ nix build -L --impure --expr 'with import ./. {}; multipath-tools.override { stdenv = clang12Stdenv; }'
...
multipath-tools> ld: callout.o:libmultipath/./structs.h:109:
multiple definition of `___error1___'; devmapper.o:structs.h:109: first defined here
Diffstat (limited to 'pkgs/os-specific/linux/multipath-tools')
| -rw-r--r-- | pkgs/os-specific/linux/multipath-tools/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 13e98924364..45ffa8896ae 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod }: stdenv.mkDerivation rec { pname = "multipath-tools"; @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { patches = [ # fix build with json-c 0.14 https://www.redhat.com/archives/dm-devel/2020-May/msg00261.html ./json-c-0.14.patch + + # pull upstream fix for -fno-common toolchains like clang-12 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/opensvc/multipath-tools/commit/23a9247fa89cd0c84fe7e0f32468fd698b1caa48.patch"; + sha256 = "10hq0g2jfkfbmwhm4x4q5cgsswj30lm34ib153alqzjzsxc1hqjk"; + }) ]; postPatch = '' |