pyrox.dev
lol
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
+11
-1
+11
-1
pkgs/applications/networking/netperf/default.nix
+11
-1
pkgs/applications/networking/netperf/default.nix
···
1
-
{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub }:
1
+
{ libsmbios, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
2
2
3
3
stdenv.mkDerivation {
4
4
pname = "netperf";
···
10
10
rev = "3bc455b23f901dae377ca0a558e1e32aa56b31c4";
11
11
sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c=";
12
12
};
13
+
14
+
patches = [
15
+
# Pul fix pending upstream inclusion for -fno-common toolchains:
16
+
# https://github.com/HewlettPackard/netperf/pull/46
17
+
(fetchpatch {
18
+
name = "fno-common.patch";
19
+
url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch";
20
+
sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4=";
21
+
})
22
+
];
13
23
14
24
buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios;
15
25
nativeBuildInputs = [ autoreconfHook ];