Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13058 from guidosarducci/master-fix-gcc10-netperf

Browse source 
netperf: fix compilation with GCC10
This commit is contained in:
Toke Høiland-Jørgensen 2020-08-09 10:14:25 +02:00 committed by GitHub
commit 416dccf72a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/netperf/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=netperf PKG_NAME:=netperf
PKG_VERSION:=2.7.0 PKG_VERSION:=2.7.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Custom PKG_LICENSE:=Custom
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

19
net/netperf/patches/010-gcc10_multiple_definition_fix.patch Normal file
View file

@ -0,0 +1,19 @@
--- a/src/nettest_omni.c
+++ b/src/nettest_omni.c
@@ -454,16 +454,6 @@ static int remote_cpu_method;
static int client_port_min = 5000;
static int client_port_max = 65535;
- /* different options for the sockets */
-
-int
- loc_nodelay, /* don't/do use NODELAY locally */
- rem_nodelay, /* don't/do use NODELAY remotely */
- loc_sndavoid, /* avoid send copies locally */
- loc_rcvavoid, /* avoid recv copies locally */
- rem_sndavoid, /* avoid send copies remotely */
- rem_rcvavoid; /* avoid recv_copies remotely */
-
extern int
loc_tcpcork,
rem_tcpcork,