diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-22 17:38:02 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-05-22 17:39:07 +0100 |
| commit | a4774b5b1b6ee17908c456727eb22d3508c8fe84 (patch) | |
| tree | bd9223788fe55ba1d8eef4a78c31db3392ba9e80 | |
| parent | e04ca593173bc086a1fa195258090aaab9279f1f (diff) | |
| download | nixpkgs-a4774b5b1b6ee17908c456727eb22d3508c8fe84.tar nixpkgs-a4774b5b1b6ee17908c456727eb22d3508c8fe84.tar.gz nixpkgs-a4774b5b1b6ee17908c456727eb22d3508c8fe84.tar.bz2 nixpkgs-a4774b5b1b6ee17908c456727eb22d3508c8fe84.tar.lz nixpkgs-a4774b5b1b6ee17908c456727eb22d3508c8fe84.tar.xz nixpkgs-a4774b5b1b6ee17908c456727eb22d3508c8fe84.tar.zst nixpkgs-a4774b5b1b6ee17908c456727eb22d3508c8fe84.zip | |
netperf: pull patch pending upstream inclusion for -fno-common toolchain support
Without the change build fails on upstream gcc-10 as:
ld: nettest_omni.o:(.bss+0x4230): multiple definition of
`loc_sndavoid'; nettest_bsd.o:(.bss+0x1c): first defined here
| -rw-r--r-- | pkgs/applications/networking/netperf/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 880ebdd2d4e..7722ab479c5 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,4 +1,4 @@ -{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub }: +{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { pname = "netperf"; @@ -11,6 +11,16 @@ stdenv.mkDerivation { sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c="; }; + patches = [ + # Pul fix pending upstream inclusion for -fno-common toolchains: + # https://github.com/HewlettPackard/netperf/pull/46 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch"; + sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4="; + }) + ]; + buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' |