gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netperf: fix build with gcc15

Browse Source 
- add patch from debian submitted in unmerged PR upstream:
https://www.github.com/HewlettPackard/netperf/pull/86

Fixes build failure with gcc15:
```
hist.h:135:6: error: conflicting types for 'HIST_purge'; have
'void(struct histogram_struct *)'
  135 | void HIST_purge(HIST h);
      |      ^~~~~~~~~~
In file included from nettest_bsd.c:175:
netlib.h:651:17: note: previous declaration of 'HIST_purge' with type
'void(void)'
  651 | extern void     HIST_purge();
      |                 ^~~~~~~~~~
nettest_bsd.c:4497:19: error: too many arguments to function
'alloc_sendfile_buf_ring'; expected 0, have 4
 4497 |       send_ring = alloc_sendfile_buf_ring(send_width,
      |                   ^~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
netlib.h:690:26: note: declared here
  690 | extern  struct ring_elt *alloc_sendfile_buf_ring();
      |                          ^~~~~~~~~~~~~~~~~~~~~~~
nettest_bsd.c: In function 'recv_tcp_stream':
nettest_bsd.c:5197:15: error: too many arguments to function
'allocate_buffer_ring'; expected 0, have 4
 5197 |   recv_ring = allocate_buffer_ring(recv_width,
      |               ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
netlib.h:679:26: note: declared here
  679 | extern  struct ring_elt *allocate_buffer_ring();
      |                          ^~~~~~~~~~~~~~~~~~~~
nettest_omni.c:5050:5: error: too many arguments to function
'HIST_get_stats'; expected 0, have 5
 5050 |     HIST_get_stats(time_hist,
      |     ^~~~~~~~~~~~~~ ~~~~~~~~~
netlib.h:650:17: note: declared here
  650 | extern void     HIST_get_stats();
      |                 ^~~~~~~~~~~~~~
nettest_omni.c:5055:19: error: too many arguments to function
'HIST_get_percentile'; expected 0, have 2
 5055 |     p50_latency = HIST_get_percentile(time_hist, 0.50);
      |                   ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
netlib.h:649:17: note: declared here
  649 | extern int      HIST_get_percentile();
      |                 ^~~~~~~~~~~~~~~~~~~
```
This commit is contained in:
ghpzin
2025-12-06 13:55:15 +03:00
parent 48fc58f947
commit 95ead3e115
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ne/netperf/package.nix
+8
View File
@@ -26,6 +26,14 @@ stdenv.mkDerivation {
url = "https://github.com/HewlettPackard/netperf/commit/c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3.patch";
sha256 = "P/lRa6EakSalKWDTgZ7bWeGleaTLLa5UhzulxKd1xE4=";
})
# Fix build with gcc15
# https://github.com/HewlettPackard/netperf/pull/86
# https://salsa.debian.org/debian/netperf/-/commit/a278c7a8eb24cb45dc500393c6e8749a3427f650
(fetchpatch {
name = "netperf-fix-build-with-gcc15.patch";
url = "https://salsa.debian.org/debian/netperf/-/raw/a278c7a8eb24cb45dc500393c6e8749a3427f650/debian/patches/0004-Fix-build-with-gcc-15.patch";
hash = "sha256-fv/cx1rkUQRqyluWQKO5q5sNWPYcyZUz2NNYwalDizQ=";
})
];
buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios;