package/netperf: fix build with gcc 10
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sat, 5 Sep 2020 12:35:18 +0000 (14:35 +0200)
committerYann E. MORIN <yann.morin.1998@free.fr>
Sun, 6 Sep 2020 07:31:42 +0000 (09:31 +0200)
Fixes:
 - http://autobuild.buildroot.org/results/547d9a803375cce93b8e3e7a59243190b71c7688

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch [new file with mode: 0644]

diff --git a/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch b/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch
new file mode 100644 (file)
index 0000000..261dfe9
--- /dev/null
@@ -0,0 +1,42 @@
+From b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <itugrok@yahoo.com>
+[Retrieved from:
+https://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[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
+