-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
package/netperf: fix build with gcc 10
Fixes: - http://autobuild.buildroot.org/results/547d9a803375cce93b8e3e7a59243190b71c7688 Signed-off-by: Fabrice Fontaine <[email protected]> Signed-off-by: Yann E. MORIN <[email protected]>
- Loading branch information
1 parent
4823661
commit 29cb5d4
Showing
1 changed file
with
42 additions
and
0 deletions.
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
From b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001 | ||
From: Fabrice Fontaine <[email protected]> | ||
Date: Sat, 5 Sep 2020 14:30:20 +0200 | ||
Subject: [PATCH] src/nettest_omni.c: fix compilation with GCC10 | ||
|
||
GCC10 defaults to -fno-common, which breaks compilation when there are | ||
multiple definitions of implicit "extern" variables. Remove the extra | ||
definitions. | ||
|
||
Fix #42 | ||
|
||
Signed-off-by: Tony Ambardar <[email protected]> | ||
[Retrieved from: | ||
https://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch] | ||
Signed-off-by: Fabrice Fontaine <[email protected]> | ||
[Upstream status: https://github.com/HewlettPackard/netperf/pull/48] | ||
--- | ||
src/nettest_omni.c | 8 -------- | ||
1 file changed, 8 deletions(-) | ||
|
||
diff --git a/src/nettest_omni.c b/src/nettest_omni.c | ||
index 852eeb1..862088a 100644 | ||
--- a/src/nettest_omni.c | ||
+++ b/src/nettest_omni.c | ||
@@ -458,14 +458,6 @@ 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, | ||
-- | ||
2.28.0 | ||
|